| commit | c2ccd90ab02afe0cda7e72e93b262b8054ffb89d | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Sep 14 21:50:56 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 21:50:56 2020 +0000 |
| tree | 557625460e4c5184597eb7ad9d104b5340c0444d | |
| parent | 83189041e9d82bcc4f540401cb87069e309654fc [diff] | |
| parent | 976aab00c0fb913e3d1b15f895899f5c458459fe [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 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: I0fe501d77d176eb43d9e308e7fe3e01c579f22bb