| commit | dd94e98e3816e8589a205f59f6b058cf58c7ad14 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Dec 10 03:58:59 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 10 03:58:59 2020 +0000 |
| tree | ed173da2429e6579955687f5d60444288a304115 | |
| parent | 6fd11baad976aa98fc9eefd4ce541879678db2b7 [diff] | |
| parent | 2a993ca1d18c9859088959abc75778e4aec7cc20 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: c111882305 -s ours am: 70cb1ee42c -s ours am: 2a993ca1d1 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1520605 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idecc25ab799fcb47b99edba27ef99f9c463d8e6b