| commit | 00a6331941b0d7411c3ac7d5674cbdc8ba425030 | [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 | 378243e8b5ffdd1ac8964cdea9fbd88843ae54ef | |
| parent | 0290fb5b84c011dfd7f743aa15ee689ad59cd652 [diff] | |
| parent | 82dfa8f2156632e7c9d908f90d8aafc89fb9d79e [diff] |
[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: a346d8259f -s ours am: 82dfa8f215 -s ours am skip reason: Change-Id I5e28537689d1a53e99f91eafd494eb3a0c890f46 with SHA-1 afbf77813b is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323623 Change-Id: I3811100a743b62c5a5e9f661647793b719824679