| commit | d7c2e728ffb1e0c39b73a4bf63ae1432bf9437bf | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sun Aug 15 04:36:53 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 15 04:36:53 2021 +0000 |
| tree | a4df5873fe64528121f3c38431ceb23903e89677 | |
| parent | 537dc9d12aa382ba6bbf5237fd61679e6782cedd [diff] | |
| parent | aedb766c71ae950b7dff9b2dcaad168805cd4a59 [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: c0d8d881ca -s ours am: aedb766c71 -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: If116bfc658593153d6f09e14525a71e566b583db