| commit | 1985b30083b70ed0bca737f2e63c0e3e01f1d683 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Sep 14 21:18:54 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 21:18:54 2020 +0000 |
| tree | 1cdf2797ca6930b37cea2f5bcc682ed4d572a7be | |
| parent | 109e72941ff1febbbf62f42b77965d4741a18192 [diff] | |
| parent | 32271f3ab0ef0bf56f78444c422aa039d9373625 [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -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: I9b5e1a916081cb266eaca328b86506481e938c7f