tree 58174fe71c6fae4fa9633784ddfa9bd7d252235e
parent f8554a7d1e4868fec64161de86465a662bbb0c44
parent ef96f113d819beaaba1626596252c4490f6e5f1e
author Xin Li <delphij@google.com> 1599796768 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796768 +0000

[automerger skipped] Merge Android R am: b85105e946 -s ours am: fafa1b08dc -s ours am: 009ea695e2 -s ours am: ef96f113d8 -s ours

am skip reason: Change-Id I25f0ca04f2e967f35d377e923f73486b95dd47e3 with SHA-1 85259cdc08 is in history

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

Change-Id: I53a90b521fb0bfe7aab65bbc12a90ba22684306f