diff options
author | Dan Stoza <stoza@google.com> | 2015-04-06 18:40:29 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-06 18:40:29 +0000 |
commit | 3490a395da012117abc4781337ea7b189aa3f0d7 (patch) | |
tree | 3c77d51f2f2fc923e73340ffcaa9575140c5c1d5 /libcutils | |
parent | b61fd6191222c6cd30abc0e23522354eb29464c8 (diff) | |
parent | 6e233ae84667c938ea1162c6dd3a3f92a5b78f2b (diff) | |
download | system_core-3490a395da012117abc4781337ea7b189aa3f0d7.zip system_core-3490a395da012117abc4781337ea7b189aa3f0d7.tar.gz system_core-3490a395da012117abc4781337ea7b189aa3f0d7.tar.bz2 |
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
Diffstat (limited to 'libcutils')
0 files changed, 0 insertions, 0 deletions