diff options
author | Bill Yi <byi@google.com> | 2016-06-07 02:40:50 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-07 02:40:50 +0000 |
commit | 7ca38bd8e798e0d6417eaebff76d219827b6e82d (patch) | |
tree | 927d2a8b81c5fcdf7eef777fd2792babce3d5f31 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b9e8801f85368ab8ac6609531d39c14612d61602 (diff) | |
parent | 90c64f02f20db0b918c3b9c26d76a8dce3e4e576 (diff) |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: f3d2c06146 -s ours
am: 90c64f02f2 -s ours
* commit '90c64f02f20db0b918c3b9c26d76a8dce3e4e576':
Change-Id: I9e305546e7aac8e3f40814633b2450ce3897b713
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions