| commit | 2cc4ca8d6bb2e3883d43337355e0a81a7c8cce6d | [log] [tgz] |
|---|---|---|
| author | Dan Stoza <stoza@google.com> | Mon Mar 23 22:27:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 23 22:27:53 2015 +0000 |
| tree | 513c4de94f6065a159e673b3e00386a229e75bbd | |
| parent | 631945200e6442421e736c05b5e1df469752faf8 [diff] | |
| parent | 8016aa7a05a6de65ffe047ba883707b0f4852fe3 [diff] |
am 8016aa7a: (-s ours) am e0f14601: (-s ours) am ca87790c: (-s ours) Merge "DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces" * commit '8016aa7a05a6de65ffe047ba883707b0f4852fe3': DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces