tree deb3ebcae8750c51386b3d513dc2666841163a61
parent 2b0ee55eb0fd2eb95b1cc54b5f30b258b0ac61ef
parent dcf68aea2884cce5c696512c78141da3354ef037
author John Reck <jreck@google.com> 1643396794 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643396794 +0000

Merge "Fix a mismatch in Bitmap_createFromParcel" into sc-dev am: 6a0f27d52f am: d797c5a620 am: dcf68aea28

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16664941

Change-Id: Ie59f64cf62dd2d02b14c8619ea5732988e8096b6