diff options
| author | Baligh Uddin <baligh@google.com> | 2014-12-28 05:52:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-28 05:52:40 +0000 |
| commit | cff138dab4b1a030314857198352775f2b5e24d3 (patch) | |
| tree | e02bd177328f09212c865fbcae71107dbbb52822 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 77f9a44adb07640762873ef0f80d32570771f154 (diff) | |
| parent | 4fa11af7682f4b2776d7bc5bc934ef02f5a7901d (diff) | |
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: b0e2d4c -s ours
automerge: 4fa11af -s ours
* commit '4fa11af7682f4b2776d7bc5bc934ef02f5a7901d':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions