diff options
| author | Bill Yi <byi@google.com> | 2016-07-01 05:14:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-01 05:14:00 +0000 |
| commit | 24b6f4efe1128b18e85361360244e0137a759f6e (patch) | |
| tree | 718f9de5999d4d5756d3a5b698802fdd9b3909c8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 488281e3363e0764b7a4dde2f8bd058857e59669 (diff) | |
| parent | c6d161425b39568c60a098f5657cc3f19c3fb506 (diff) | |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: da696a6d9c -s ours
am: c6d161425b -s ours
Change-Id: I72cf16e96522446538147bd99310c7d71f960239
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions