Skip to content
Commit 3ca9f93b authored by Leon Scroggins's avatar Leon Scroggins Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "ImageDecoder: Use AssetFileDescriptor's length"...

[automerger skipped] Merge "ImageDecoder: Use AssetFileDescriptor's length" am: efca2d56 am: 3a62413c am: b9d7c9ec am: 226c4779 am: 04573f24 -s ours

am skip reason: Change-Id I8d8e520f43a7ef0d7e4534ef165d8c7e4d2a0b55 with SHA-1 c3fda89b is in history

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

Change-Id: I5208a451f5b04fb26657e44c89ecf1f1562d31a7
parents c36eb5a1 04573f24
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment