| commit | 973fa96da15a1037d4055168f5bb32e541ab10e0 | [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 | 9edb51557eb860a1d4eaba5f2e66d0597b43a9c7 [diff] | |
| parent | 74f56497f7afcd5380c06136168372cac8e4712d [diff] |
[automerger skipped] Merge ab/7061308 into stage. am: ebe89282e9 -s ours am: 74f56497f7 -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