diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 18:51:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 18:51:45 +0000 |
| commit | a8420151b6a46cf0a74f9bacc878cea93179755d (patch) | |
| tree | db123fc3f028d65464b0d1fdbf59207786dc3aa0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9103508a09ec8c90f40f05741008c7853c42cd04 (diff) | |
| parent | f21ed271f60183c55290b6a82d1ad60a8ed6228c (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93bc210b3f -s ours am: 6c4a3962e7 -s ours
am: f21ed271f6 -s ours
* commit 'f21ed271f60183c55290b6a82d1ad60a8ed6228c':
Change-Id: I19ff40313b8b5eef2df298ae41acc71def6e6972
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions