Skip to content
Commit a477c04b authored by Leon Scroggins III's avatar Leon Scroggins III Committed by android-build-merger
Browse files

[automerger skipped] Merge "Ensure that hardware Bitmap has a ColorSpace" into... 

[automerger skipped] Merge "Ensure that hardware Bitmap has a ColorSpace" into qt-dev am: 46ea5598
am: fc653368 -s ours
am skip reason: change_id Iad7f7d7cafce0a8759a84a4296ae5c3ce86dff4c with SHA1 7fb4c9e4 is in history

Change-Id: I6c7caa120eecd0a0f7d66c96b24a1e7c925a9874
parents 57ba9783 fc653368
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment