| commit | 0d4064bd03962cfa4ae2b3f8d48b21e4696f0db0 | [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 | e146ae3571e1a8d3c07b03624c2f64926c902b19 | |
| parent | 1cff53f0979297f2771939d12898e1a21662866e [diff] | |
| parent | 6b2e6ab2f554148e15b43c8d1224ced0ee8352bd [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 201f2cf86d -s ours am: 54ec331515 -s ours am: 6b2e6ab2f5 -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