diff options
| author | 2022-06-24 03:41:51 +0000 | |
|---|---|---|
| committer | 2022-06-24 03:41:51 +0000 | |
| commit | 9e328701212bd4a8a1d3d59870ff6520d700f2f9 (patch) | |
| tree | cd22e2b633ac0a54d3e3219c8c8e6834ff89ce0f /libs/hwui/HardwareBitmapUploader.cpp | |
| parent | 96f6aae26f7994d65a0e2275fd716f90820972b6 (diff) | |
| parent | 9b59009ec305a5008885ad5a56ab28182280a430 (diff) | |
Merge "[automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours am: c543f70e3d -s ours am: aa456df74e -s ours am: b1cf2a0cd2 -s ours am: 5b060c236a -s ours am: 8974fef6e9 -s ours am: a2b313aecf -s ours am: 21bc5de8b0 -s ours" into tm-qpr-dev-plus-aosp am: 9b59009ec3 -s ours
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 8e278543bd is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18625677
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18659051
Change-Id: I205b74a206f46e72b7f330d4f4f269f28e1ff23a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/hwui/HardwareBitmapUploader.cpp')
0 files changed, 0 insertions, 0 deletions