| commit | 3d24c2cad7b626fb2bf1b95b3a628a9b3184e732 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Feb 23 10:35:03 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 23 10:35:03 2021 +0000 |
| tree | cb4e0b04305dc7873c62adb3017eba8159e91d42 | |
| parent | f23f54ca4147bbcf1a5a76057651bfc833d84eb7 [diff] | |
| parent | edeb7e0203e4c8aa1249b86573ba93d34db1d02c [diff] |
[automerger skipped] Merge ab/7061308 into stage. am: e9a1554fea -s ours am: edeb7e0203 -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: I831ba618445a338cc57e0cdbff65e3c44aeaf93f