tree e6b08c5ec7fd9e2a773dbee444ef2d65d1e1e4fe
parent c302db2bbd64e794ed186ae2c18fe86a049e573d
parent 97f9ba624fbb908fb6ddd79569af3d7386b65a0a
author Xin Li <delphij@google.com> 1607569512 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607569512 +0000

[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 97f9ba624f -s ours

am skip reason: Change-Id I3d55c164ebb6879c95a89e0d19922b7fb0587e7d with SHA-1 c302db2bbd is in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/sdk/+/1520451

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3366c837ca830d8d65408eeb72b91986daf8ddb5