diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-29 14:51:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-29 14:51:52 +0000 |
| commit | cd3b1d77c5ed8071ee3e6638208f1065578076dc (patch) | |
| tree | 284abf1b499e7d841792ec98d27f29bf67b0175d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 52520375ff80f63580936ad26392a0337b524e42 (diff) | |
| parent | 9b552e34004747166ad3d0f0789fb54f3a7f3094 (diff) | |
am 9b552e34: (-s ours) am 0d8e091e: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '9b552e34004747166ad3d0f0789fb54f3a7f3094':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions