| commit | bbf704318953b096bb12ae6022ac23fbe4727ee5 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Sep 14 22:20:16 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 22:20:16 2020 +0000 |
| tree | fb1320bec3ded6d2f373570b5d8cfe44cef4f232 | |
| parent | 873cfb8d94c8ccc082d788539d1eef651f84d9d9 [diff] | |
| parent | f9aa95f5803393b163e5675b175efab20d6d0a5f [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours am: 38f130d49c -s ours am: f9aa95f580 -s ours am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741 Change-Id: I36d5555b5fa23140e4916f568353af25b579c653