| commit | 38436142ff29b3f8c1f59ee0597b873298814c0b | [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 | ad35f252909e68aa9dfd8e929d0f679b3db276f0 | |
| parent | b7fcf57c8d011488133272279cbc2d8d1d4ceb3a [diff] | |
| parent | 8780ad918dbdb713f31dc6c1efa249ccd27a7dfe [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