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