| commit | 74f56497f7afcd5380c06136168372cac8e4712d | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Feb 23 09:05:19 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 23 09:05:19 2021 +0000 |
| tree | 425d0a311bd0f5c654d67a106c37cef96de846a9 | |
| parent | 4f4e4a4b670a9358138bd00117c06d6370a82a1e [diff] | |
| parent | ebe89282e936f328c545b7bc8ec749a74b868d13 [diff] |
[automerger skipped] Merge ab/7061308 into stage. am: ebe89282e9 -s ours am skip reason: Change-Id I4bf82035631ccff6d5a6144d6d9b1d203b076851 with SHA-1 3078660c4e is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13657544 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie387abaa6af0c76ebd6801707d21443ebbda5c93