| commit | 8ec4998ad93534ea3ec3722d09c429371a3f339e | [log] [tgz] |
|---|---|---|
| author | Mark Chien <markchien@google.com> | Mon Oct 12 10:47:49 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 12 10:47:49 2020 +0000 |
| tree | d3ed01ef22cd698bc3dcfaa026d422a306d94725 | |
| parent | aa448a3514169847b2a4517af174bfaeaf7e2863 [diff] | |
| parent | 0a53121de5434ce9430b713cae552a6af16f1bf7 [diff] |
[automerger skipped] Merge changes I60ed5465,I70b49d0a into mainline-prod am: 0a53121de5 -s ours am skip reason: Change-Id Iddc5304730dce7b11c5d124b7eddce057d752bbd with SHA-1 a2ffad84c7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12789075 Change-Id: Ia95b27c0ce749a9f7cab5cba532fde873bf44cb0