diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-29 14:42:33 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-29 14:42:33 +0000 |
commit | 89176d5d00efa49c2a25e6bd2280408fd94d0280 (patch) | |
tree | 27538a6101c75339440c743ff698bddea7539dc9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | ab38b8e5ea4149dcc8447f90dcaf6d5c250da416 (diff) | |
parent | 19efc9e50fd398a06493f841cdae469c0a93bc6d (diff) |
am 19efc9e5: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '19efc9e50fd398a06493f841cdae469c0a93bc6d':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions