| commit | 242bf496ab025c150218f519c4dc7fc57ba8ac92 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Dec 10 03:59:00 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 10 03:59:00 2020 +0000 |
| tree | dda5c2357d28247f69311f85b8289f1e024666cb | |
| parent | 8a826845a38d370b61fe7b9d13ac5c98aeaba58c [diff] | |
| parent | 8fdc3926b5391512e9e89e1c7314324d2da69ced [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 0ee91db1db -s ours am: 13e5f8e80d -s ours am: 8fdc3926b5 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520888 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id78860e6761ba4c4954c02508f16ae975e1fb161