| commit | 14f8090d921114891b71e6b11a43dd4eef36a45b | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat May 08 03:34:30 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 08 03:34:30 2021 +0000 |
| tree | 494baf37649d480f58201f9332cf14236aeed924 | |
| parent | 81b359b3a93f1d9a1b982657f5e773a540a396ce [diff] | |
| parent | 7373c1c4ea0da7b9dd274a0adb41be9a58581289 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: f2a516095e -s ours am: f4f6e27ce7 -s ours am: f60bb2159c -s ours am: c34fb62965 -s ours am: 7373c1c4ea -s ours am skip reason: Merged-In If07afd9af680cd2a5ece6506df5383e5cc258663 with SHA-1 c99390638c is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1700266 Change-Id: Ic980c7fe7e7907f766ce986b26e9a77c3c655cd9