| commit | ea78779b1af8a918c1660964636c12792c450f1f | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 15 04:38:45 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 15 04:38:45 2021 +0000 |
| tree | a4df5873fe64528121f3c38431ceb23903e89677 | |
| parent | d7c2e728ffb1e0c39b73a4bf63ae1432bf9437bf [diff] | |
| parent | 1d5cb53df11a27da2ad42f241b369a102a1d8e14 [diff] |
Merge "[automerger skipped] Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 30a1c99c1b -s ours am: 88ea9d745a -s ours" into sc-qpr1-dev-plus-aosp am: e3c26a260c -s ours am: 1d5cb53df1 -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: Ie3ca8242568fb4d4e749c9915805fe536c20a27e