[automerger skipped] Merge "Use pixel format from buffer to determine...
[automerger skipped] Merge "Use pixel format from buffer to determine opacity." am: f667bfa4 am: e3eb4df3 -s ours am: a9c5d264 -s ours
am skip reason: Change-Id I4295b837369b8ca8918d8398a29cab133a47cbf7 with SHA-1 debadb8a is in history
Change-Id: Iac99e4d608f1e52b18874e9c645ec55eda3d9d27