| commit | 19df70dc1527ddad0ce6558c94b0806897b845db | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Jun 08 16:42:05 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 08 16:42:05 2020 +0000 |
| tree | 48ab071e0490d63ed992be088162677e8cbc4955 | |
| parent | 26e400469e514ef33817e22f579dbcc447f15271 [diff] | |
| parent | 14beee853ab6463a53fe23e0886a673d09e989d4 [diff] |
[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: d7785982ac -s ours am: 8028fe1945 -s ours am: 669666f430 -s ours am: 14beee853a -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: Id2777f3b97ff4733dfda185b8feceb4cc25330bc