tree e6b08c5ec7fd9e2a773dbee444ef2d65d1e1e4fe
parent 7ce8d17ac5678fd2de4751e91b1a0d1a6eb9829d
parent c1143592eedcc8858cf0f78aee9466bf6621f1f9
author Xin Li <delphij@google.com> 1607572012 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607572012 +0000

[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 97f9ba624f -s ours am: c1143592ee -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: I0650082387ba9c84e91a3b1e0ff2d559cf933819