| commit | c90364f98ec8dbd93b5d87f24d7031a2a3eb0f2c | [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 | fa0205629be8fb6fa7105b9cb863f6a523174b6f | |
| parent | 9d15624d8659b455372d0b375a14081dc70debd5 [diff] | |
| parent | 3a388bf8a4a1ed39a59ea65f9049cc01bbaaae0b [diff] |
[automerger skipped] Merge ab/7061308 into stage. am: e8cbbd6b6c -s ours am: 3a388bf8a4 -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