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