commit | 1d5cb53df11a27da2ad42f241b369a102a1d8e14 | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 15 04:22:50 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 15 04:22:50 2021 +0000 |
tree | a4df5873fe64528121f3c38431ceb23903e89677 | |
parent | aedb766c71ae950b7dff9b2dcaad168805cd4a59 [diff] | |
parent | e3c26a260c1af90ee4427ae0936ca321f7935695 [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 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: I15750b9f01f3a73fe4b2d8c9c8d4dfc87fce46dd