diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-19 18:17:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 18:17:46 +0000 |
| commit | d6fb31adde6cf6c17ee794fd51ea23dbe88ac20e (patch) | |
| tree | cd16f63e49e7e644433abd1c5ffd1c3a780bee73 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 2d027aa6d41a72b84dfc0fa4e3e21fffbb5526f6 (diff) | |
| parent | 4fb221dfab8822ca1ef22dcde501526bfa1f4b65 (diff) | |
am 4fb221df: (-s ours) am 5c3ea10c: (-s ours) am 331c3ec7: (-s ours) am 7bd7a242: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '4fb221dfab8822ca1ef22dcde501526bfa1f4b65':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions