diff options
author | Bill Yi <byi@google.com> | 2017-07-26 08:31:39 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-26 08:31:39 +0000 |
commit | 586abb8c03e6bf20645b662cc4ea0783d7581dc1 (patch) | |
tree | 2268ab4e8b606824b5b19b7835a46d5759b9689a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d6b855eca9e112a03958abdc8dc699c9b7288734 (diff) | |
parent | 8f148cdce4d1cc42ddd543a0c574490abcaf914c (diff) |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741ae -s ours am: 799144a18b -s ours" into oc-dr1-dev-plus-aosp
am: 8f148cdce4 -s ours
Change-Id: Iedac6d64df4cb01b070abc9b277a2be66f4d2c80
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions