diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-19 03:06:52 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 03:06:52 +0000 |
commit | 57e83d535255ac6e29213bf753425169a9641dea (patch) | |
tree | e4b097e9d0a3e8adb2c93d006c582d8e1c7a7722 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 8ac405074d1a66ab33620dd5bdbb07c5831cb113 (diff) | |
parent | 06f02f3e14474aab5d4994e4603eda5a54180b13 (diff) |
am 06f02f3e: (-s ours) am dc6c5277: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '06f02f3e14474aab5d4994e4603eda5a54180b13':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions