tree 808ec2a0acb239a02c24904e977766fafd9023da
parent 85a49a8961abaed9aa96f236d9898db784ba7667
parent c92ce6d23810fd65ddca7e9c7a575bddc9425d41
author Xin Li <delphij@google.com> 1598996818 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598996818 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 43b7ebf015 -s ours am: c92ce6d238 -s ours

am skip reason: Change-Id I27c2ede56c89e9145b6f1a5cdd349fe37d3a229b with SHA-1 fc8c47718e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/12470014

Change-Id: Ic4b196b8fd640aa01ecdfd7768b2304917211a35