am 6e233ae8: (-s ours) am dcc7aadb: (-s ours) Merge "DO NOT MERGE Add...
am 6e233ae8: (-s ours) am dcc7aadb: (-s ours) Merge "DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces" into stage-aosp-master
* commit '6e233ae8':
DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces