| commit | 14beee853ab6463a53fe23e0886a673d09e989d4 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Jun 08 16:29:22 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 08 16:29:22 2020 +0000 |
| tree | 48ab071e0490d63ed992be088162677e8cbc4955 | |
| parent | 076222e52ca7cb41e26cd3c47883ec2e63a2857d [diff] | |
| parent | 669666f430eb9bdd3f4a7d1d0074f92d7566b209 [diff] |
[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: d7785982ac -s ours am: 8028fe1945 -s ours am: 669666f430 -s ours am skip reason: Change-Id I5e28537689d1a53e99f91eafd494eb3a0c890f46 with SHA-1 22238ed86f is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323623 Change-Id: Ie30658c18424bb30696876b4b4a103fe1c645ab7