| commit | 2bcfd77e3b4e32830e48f2d695cf0d3afc1fe4de | [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 | 1cdf2797ca6930b37cea2f5bcc682ed4d572a7be | |
| parent | 3c30341b97ffe166328ba7a4b0e72e2e9cd072f9 [diff] | |
| parent | 2d0bf149cf73203abb2ecc8b101d679265774e8a [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours am: 1985b30083 -s ours am: 2d0bf149cf -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