diff options
| author | Bill Yi <byi@google.com> | 2016-07-01 05:11:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-01 05:11:04 +0000 |
| commit | 488281e3363e0764b7a4dde2f8bd058857e59669 (patch) | |
| tree | 718f9de5999d4d5756d3a5b698802fdd9b3909c8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4076e502e794ef6c6bccd59bfd148724666bf7cc (diff) | |
| parent | 2c7f1130e4d558ab5037cdefacc8d206fecb68cd (diff) | |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 689366fe33 -s ours
am: 2c7f1130e4 -s ours
Change-Id: I887b1a63787c871651ffa1cd420bcb99941e291a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions