diff options
author | Bill Yi <byi@google.com> | 2017-08-16 15:26:25 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-16 15:26:25 +0000 |
commit | 983c33662107b51178391d3f82f67e2a14af0feb (patch) | |
tree | f9cf4ee471670acdbe5b7cdd4f19305359b16cf7 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | c8cb7b107f0d2027344ddba24be465bb1fa9e4ad (diff) | |
parent | b3f67e12beceee9151dd4037b79f0fc49034b35e (diff) |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: b3f67e12be -s ours
Change-Id: Ic4efe5ee0cbbf8c14f6cde99f0254ce34aec1b20
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions