| commit | 38f130d49c9ea89b5029a38393cb21c8f8b4c40d | [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 | d7cec8ef21273afd88c4c85abde774370e96eb62 | |
| parent | ec49b75d0ab2636a765e08e2474129d28305a90a [diff] | |
| parent | 85e0b4a45d16dd18d0bce1f9c3b7ebd418594f23 [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