diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-21 00:13:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-21 00:13:45 +0000 |
| commit | 5509e7367ed8596a6c0b51acaf46c88cc06629b8 (patch) | |
| tree | e6741c5944cadd80c6f7ef9708a76cb1782d9576 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 06e260b8dbe3fbc0456acd171e442b0c5930a7ea (diff) | |
| parent | 385f2d18c631190fc9eb0ea14b288f5589a1f30c (diff) | |
am 385f2d18: (-s ours) am 6b12a5fe: (-s ours) am 5038b92e: (-s ours) am ddb33d7d: (-s ours) am a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '385f2d18c631190fc9eb0ea14b288f5589a1f30c':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions