| commit | 669666f430eb9bdd3f4a7d1d0074f92d7566b209 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Jun 08 16:08:03 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 08 16:08:03 2020 +0000 |
| tree | 48ab071e0490d63ed992be088162677e8cbc4955 | |
| parent | 9ceac210666fcaaca78c20fb0c0ca938bcf35552 [diff] | |
| parent | d56d89c8a696755a3a1d64bb3bb00a629a9d2572 [diff] |
[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: d7785982ac -s ours am: 8028fe1945 -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: I3811100a743b62c5a5e9f661647793b719824679