| commit | edeb7e0203e4c8aa1249b86573ba93d34db1d02c | [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 | 50f740a4e93e585b234576a3492200d543f7d93a [diff] | |
| parent | e9a1554feae01192b1d7bd50c2cb9c12e6e121f9 [diff] |
[automerger skipped] Merge ab/7061308 into stage. am: e9a1554fea -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