| commit | 184d8f7a1dddc61259a9b885f22ad04739378c0d | [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 | 1cdf2797ca6930b37cea2f5bcc682ed4d572a7be | |
| parent | fcd3ccb8f2fe14388e1fde502ef3b306f30d8d9e [diff] | |
| parent | 76aa28f13d83fbb92631165c44e8b8b15338dba1 [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: be4888fcbd am: fb28b05165 -s ours am: 2034c8ab62 -s ours am: 76aa28f13d -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