diff options
| author | Baligh Uddin <baligh@google.com> | 2014-12-28 05:55:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-28 05:55:15 +0000 |
| commit | 32518b17d9361d562c33ac1de143042eed2d37aa (patch) | |
| tree | e02bd177328f09212c865fbcae71107dbbb52822 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e30aa49748df8df617efdd8065bfa841792411cc (diff) | |
| parent | 98ff0febf4c93504f07b024aab4645b5ad5548ec (diff) | |
am 4acca673: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: 378939f -s ours
automerge: 98ff0fe -s ours
* commit '98ff0febf4c93504f07b024aab4645b5ad5548ec':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions