diff options
| author | Bill Yi <byi@google.com> | 2017-06-13 02:57:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-13 02:57:02 +0000 |
| commit | 8819941254585e91a6fd430e135597cefc48a930 (patch) | |
| tree | 45522cce935f3a9053b1634660d1803b551cc2e6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 945cac01661ea2908e05cf59bf2abf1958ca48ba (diff) | |
| parent | cea026e027255dec29e2b0e457dfa4f1129a4c00 (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 7fc501184a -s ours am: 15094560a4 -s ours" into oc-dr1-dev-plus-aosp
am: cea026e027 -s ours
Change-Id: I513fd5f60ed065f483a955f96fcf6db0fbc6ca4a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions