diff options
author | Bill Yi <byi@google.com> | 2016-07-01 05:09:18 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-01 05:09:18 +0000 |
commit | 5678f94efbaeb428b80b0ef01ef0ca074a47a6de (patch) | |
tree | 51fbbf5b8f8f5f12fc209caea2b1cf2ad3c82f91 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 37da5078c007ee5ae7de45de6c054281e6ff0bb5 (diff) | |
parent | aac5c0e427e639f996e42e73ca736a2798d1a3f2 (diff) |
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: aac5c0e427 -s ours
Change-Id: I5ba367cb854039a4de86a36808296242e0258e3d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions