| commit | 7373c1c4ea0da7b9dd274a0adb41be9a58581289 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat May 08 03:06:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 08 03:06:33 2021 +0000 |
| tree | 494baf37649d480f58201f9332cf14236aeed924 | |
| parent | f12f9f18753a174689263fc11e721f2339174b40 [diff] | |
| parent | c34fb6296537e7effffbb08d0cee378f0ac0e4c5 [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 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: I49fa0c4f982f85c0a77143cb7f383c1a083aac57