diff options
| author | John Reck <jreck@google.com> | 2014-10-22 20:48:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-22 20:48:27 +0000 |
| commit | 7c8f44ae529ce32356d83e92c26d9ba62be3298c (patch) | |
| tree | 56a6e211764dea32417019f2e50bd923a9661b59 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 80d812b9b5cac86d74d8de6d72c83462c78087ba (diff) | |
| parent | 36c2aa4a6394047f02c4f236233b41d738ff56c1 (diff) | |
am 36c2aa4a: Merge "Surface:lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev
* commit '36c2aa4a6394047f02c4f236233b41d738ff56c1':
Surface:lockHardwareCanvas DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions