| commit | 50c6aa570a801564c82ff178594d0a767adb8de3 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 08:02:00 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:02:00 2020 +0000 |
| tree | ee26452d586570727ed2d629f060e637aa9ab3d7 | |
| parent | d4d168512085d10dd6b1ba50f69be3ef6f1be248 [diff] | |
| parent | fcc0d87a9eae4de07785d66e7fb342da39b6f68b [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 72459e4a0e am: 9975ba02cf -s ours am: 4c11750cfb -s ours am: fcc0d87a9e -s ours am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515 Change-Id: I908bcb9330b0e2cf00374276e1d8e5fa3fc67fab