tree 7d8d8cac0f8b7ebc55c20f7d7bbdd5ea53a47392
parent 835a04c8527c90b0c00a2c52f67488946912c82e
parent dcc7aadb96e3c408d301377827de24f5f9bfe63f
author Dan Stoza <stoza@google.com> 1428344376 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428344376 +0000

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

* commit 'dcc7aadb96e3c408d301377827de24f5f9bfe63f':
  DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces