diff options
author | Bill Yi <byi@google.com> | 2016-05-23 16:10:55 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-05-23 16:10:55 +0000 |
commit | 9306f9d98ae25c6056b8571d73f48c48f7ce7f22 (patch) | |
tree | f18b4f23760535840cf3c0410eb17d186883dd01 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 7b71c6095ddead961cf4da2c484f04dfcf714888 (diff) | |
parent | 5745dc0e452a272dbaebe26e9e7838431b4ce74f (diff) |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 6a983faab3 -s ours
am: 5745dc0e45 -s ours
* commit '5745dc0e452a272dbaebe26e9e7838431b4ce74f':
Change-Id: I5aae9c5e056a03be099e5766cdbd53ded98e435e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions