| commit | f60bb2159c507a9e1c8a843b613fda738068b436 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat May 08 02:13:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 08 02:13:48 2021 +0000 |
| tree | 06ad595fe30c810a102b0faaa8c301ce5d119ef1 | |
| parent | 0514efd77fc9d654dd67378f16315c2a67a5c9ca [diff] | |
| parent | f4f6e27ce743b490628b613fe632ccb2b8f5e63e [diff] |
[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: f2a516095e -s ours am: f4f6e27ce7 -s ours am skip reason: Merged-In If07afd9af680cd2a5ece6506df5383e5cc258663 with SHA-1 bdb53ab39d is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1700266 Change-Id: Ie8f7918ac6d841aae12d215ba907da4f6d512daa