tree 08b53652857dee6697fc8de5862737052c12d33d
parent 4a6c25fea78c45e8f8871cf85d137907785820c1
parent ec1d5c9a119710e42f5b45ffb96b164b3d46d4ba
author Xin Li <delphij@google.com> 1633679830 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679830 +0000

[automerger skipped] Merge Android 12 am: 0ebf3c13bf -s ours am: cb14cbeaa4 -s ours am: ec1d5c9a11 -s ours

am skip reason: Merged-In Iea25ab2acc22bf7e8dea6afeb5b26df04502e956 with SHA-1 f459a64379 is already in history

Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1847513

Change-Id: Ia1f3f404999f6e29041b62b9e842bb334ca6ed71