| commit | 85080c242a72ac4b7ffba9555beb941557aa0b07 | [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 | 557625460e4c5184597eb7ad9d104b5340c0444d | |
| parent | de97f2238c14273ed0404ec954cec00ffc62226b [diff] | |
| parent | c2ccd90ab02afe0cda7e72e93b262b8054ffb89d [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: c09a299d85 -s ours am: 976aab00c0 -s ours am: c2ccd90ab0 -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