diff options
author | Geoff Mendal <mendal@google.com> | 2016-02-02 21:29:47 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-02-02 21:29:47 +0000 |
commit | c2ca962f060afedb146d35ff35763b9e8d8c974a (patch) | |
tree | 683af2b9387b2a1ecb3803939318338bb5b6ae54 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 39c8547b5ebb9cfa7a05e788f43eaa77d9de1241 (diff) | |
parent | 26b12b719d317ae8d57f5b43bd9cd1e96b2cad5d (diff) |
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 26b12b719d -s ours
* commit '26b12b719d317ae8d57f5b43bd9cd1e96b2cad5d':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions