| commit | 8968532fa365adca7afb1035635f1d690bc55776 | [log] [tgz] |
|---|---|---|
| author | Dan Stoza <stoza@google.com> | Mon Apr 06 18:40:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 06 18:40:29 2015 +0000 |
| tree | 3c77d51f2f2fc923e73340ffcaa9575140c5c1d5 | |
| parent | 7f12104437c83dbe8cc2f109109dee909a892ed3 [diff] | |
| parent | a75b9952d979a5b2c4d22d092ba82e60a70fc08c [diff] |
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 '6e233ae84667c938ea1162c6dd3a3f92a5b78f2b': DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces