diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2015-09-03 04:35:51 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-03 04:35:51 +0000 |
commit | 5d374418916f6efd7bb9f4997192ea8f6d6535ee (patch) | |
tree | e5ae0e888cffcad73a1933ecddb4bd53f3abe357 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | efc55f33a86c778190c340c89fe24969340a5678 (diff) | |
parent | af5268c965d5912850cd8dacb31f738dbba6fa39 (diff) |
am af5268c9: (-s ours) am cb41a60e: am 7f2b4b6a: am 7e28b3bc: am f50d4ce6: Merge "DO NOT MERGE: Fix DngCreator default crop calculations." into mnc-dev
* commit 'af5268c965d5912850cd8dacb31f738dbba6fa39':
DO NOT MERGE: Fix DngCreator default crop calculations.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions