tree dc14d3d116fe072cbfd245e73567c9d2eaf42384
parent 05ca7c47e6a2ccb3c5d53e55fc91a56032d2b71f
parent 52d9ebfd546142f0aff92d7044a024af53b73f36
author Xin Li <delphij@google.com> 1598998178 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598998178 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 3f8d030a1f -s ours am: 63b8591043 -s ours am: 52d9ebfd54 -s ours

am skip reason: Change-Id I7ebdd475c17377ecd3b6a7586442b55a12e32c37 with SHA-1 ca2402d8eb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/12469979

Change-Id: Ifae6f0e3a0c6c569f650abb0bc83f53173d92b3a