| commit | c0d8d881ca73191b53eb72712a718e5f74a23197 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Aug 13 21:30:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 21:30:42 2021 +0000 |
| tree | 05af1b72a6ad36683eb2d25ea72a641ec9ddebeb | |
| parent | 1dc848512dcf8feb906da670b6a228abd265736c [diff] | |
| parent | 2f985162ca51210f3779600ccc3cb702a3ea0ed1 [diff] |
[automerger skipped] Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 30a1c99c1b -s ours am: 78e68f78c7 -s ours am skip reason: Merged-In I35aae96e4ebb0c13bc567bb926f2e7a549f554ba with SHA-1 6c582e973d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15547733 Change-Id: I6162e93e7f80a6662e9a953883a2e02372c26009