| commit | 955e04a8eedb2fe2b6ec1ae4a70c8b485535c5b7 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Aug 06 16:02:18 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 06 16:02:18 2020 +0000 |
| tree | 50a93676cc9198f4c98b96e98e89f9b13c6bd4c3 | |
| parent | c82b42a599402bc655f76f3aad7959293a7572fe [diff] | |
| parent | 4939ba29f525cefb6ca4d81ceb470783a56d1be0 [diff] |
[automerger skipped] Merge "Merge QQ3A.200805.001" am: 4b3c00e75f am: 4939ba29f5 -s ours am skip reason: Change-Id I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 with SHA-1 9450069de9 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1387434 Change-Id: I110045d98caea24424bf28d315cb99b353870722