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

[automerger skipped] Merge Android 12 am: 0ebf3c13bf -s ours am: cb14cbeaa4 -s ours am: ec1d5c9a11 -s ours am: 4cec2305ab -s ours am: ea7ef0f630 -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: Iddc978f1c374a973b4642ff7745b7576000ad64f