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