diff options
| author | Bill Yi <byi@google.com> | 2016-06-07 02:41:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-07 02:41:26 +0000 |
| commit | 9098ccdd707b7e5513c8746f7132ab39cb03e469 (patch) | |
| tree | a5e97e424dc94caf056887c661869703dfb183b6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 360724ecdaaf6c703c3b2d53eecc31492a08ce8a (diff) | |
| parent | 3658e10468d551b98e54e15bb4cabac153c6258f (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: f3d2c06146 -s ours am: b3d3104969 -s ours" into nyc-mr1-dev-plus-aosp
am: 3658e10468 -s ours
* commit '3658e10468d551b98e54e15bb4cabac153c6258f':
Import translations. DO NOT MERGE
Change-Id: I1dd3967ed9f6e46d44637a38bd1fa0e4c78af690
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions