diff options
author | Bill Yi <byi@google.com> | 2016-06-16 10:14:16 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-16 10:14:16 +0000 |
commit | 5c3eb56faa04ecd818cac66f6689fb8db87c8453 (patch) | |
tree | 8dd450c8d631478ebb49ac5e204682242603c887 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 3277563de62ecd1b2eb1ef69fa51ed083bc30dea (diff) | |
parent | a092dcaa1c8578fa4abb13f10a6f03644442f0b9 (diff) |
Merge \"Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: c985571e5e -s ours\" into nyc-mr1-dev-plus-aosp
am: a092dcaa1c -s ours
Change-Id: Id6bc13221408023dd4376f955743bb2415e05c6f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions