commit | a8967036e9659132d8388f14f9deb653158c24a3 | [log] [tgz] |
---|---|---|
author | Dan Stoza <stoza@google.com> | Fri Mar 20 18:37:18 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 18:37:18 2015 +0000 |
tree | 989b8000829cefb26964ed177ce986b3e38230a9 | |
parent | 096721d7c78715d3c1b95314f170c61c2797746d [diff] | |
parent | e54f6144b2b8abc78a55e3fe21263ddabe9ea5e6 [diff] |
am e0f14601: (-s ours) am ca87790c: (-s ours) Merge "DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces" * commit 'e0f146015d35fdc8d870863abb5728f4086925d6': DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces