diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-19 03:07:39 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 03:07:39 +0000 |
commit | 2434a36da2a491fa30aa81921207d633bee508a8 (patch) | |
tree | e4b097e9d0a3e8adb2c93d006c582d8e1c7a7722 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | e97d2b1c55ad240db3f2b46c2b5849ecd2236c18 (diff) | |
parent | af0c15d7bf3b409a1fa114304ed0c81924f055a6 (diff) |
am af0c15d7: (-s ours) am 4cfcdac0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'af0c15d7bf3b409a1fa114304ed0c81924f055a6':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions