diff options
author | Bill Yi <byi@google.com> | 2017-08-16 16:00:25 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-16 16:00:25 +0000 |
commit | 2eb13c7a733753836b7ae342b85e57c5b13ad3a6 (patch) | |
tree | 1d88563fe2f5cabe023416fe748e0b180435b627 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 76ae5a498dfddce4b372ebb9baaa74fd9c8e54e0 (diff) | |
parent | 6ccc89cb13f96b1ca6dfdea72bf7af4b3f3645ef (diff) |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 6ccc89cb13 -s ours
Change-Id: I1a00ce8149f6dfcb40763ee1dad1a6bef4ce15e7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions