diff options
| author | Geoff Mendal <mendal@google.com> | 2015-10-21 17:26:14 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-21 17:26:14 +0000 |
| commit | aca0e50f86084e0b3f51a53237fe3f1553f67d84 (patch) | |
| tree | 0f705c1d97a224af03e1f875f78f1e941003e852 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 22e23d1dd475f46fd1129642bdfe1e0275a6d4f0 (diff) | |
| parent | c6fe063ddf113a5551f3bfe6a1f1631c775d9cc6 (diff) | |
Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev am: 84ab40cab2
am: c6fe063ddf
* commit 'c6fe063ddf113a5551f3bfe6a1f1631c775d9cc6':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions