diff options
| author | Bill Yi <byi@google.com> | 2016-06-20 19:15:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-20 19:15:57 +0000 |
| commit | 712edd36aa4efdf9319065e72f87cfb43b0a242b (patch) | |
| tree | 6694ff67f53e9715d08c1fe2bf33d275954f0e93 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | dd085737ff72f0f4a69eb482fc82fa3c2161b45f (diff) | |
| parent | ddc101ee512bbc8aec55cf77afecce7f4c338b40 (diff) | |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: a69a9bdc1f -s ours
am: ddc101ee51 -s ours
Change-Id: I6189a9336264a097e60c875466ca22e553d493bf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions