| commit | e96665990903d27beb1047012fb383c592ba4458 | [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 | 42a1b1abf257f28ddc4373eeb0b4e20c355c7747 | |
| parent | ce754dd835f8da0fcee0898afdac2a66bed8fff8 [diff] | |
| parent | d75731b1243504459e249d2af28626f3cfdef938 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 7b4d6dcf27 -s ours am: 94183c9cb8 -s ours am: d75731b124 -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