diff options
author | Bill Yi <byi@google.com> | 2016-07-01 05:06:29 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-01 05:06:29 +0000 |
commit | a3c15e1dff246d1674f3374a02ced1902b8b0833 (patch) | |
tree | 51fbbf5b8f8f5f12fc209caea2b1cf2ad3c82f91 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d3a428f1e1bf48bed9623e5df9a5e6c4c0c61cbc (diff) | |
parent | 2250c7ccaa0b3d6a899a7bd7d72ac89092458758 (diff) |
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 2250c7ccaa -s ours
Change-Id: Ic70bc275a19e5421583b28e074ebdb435a02b2ea
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions