diff options
| author | Dan Albert <danalbert@google.com> | 2015-11-05 21:05:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-05 21:05:28 +0000 |
| commit | 7a10a986c5eafbf243654119d2f6d431258f6402 (patch) | |
| tree | e3ab6c1096cc81e2ebc5d4d11bc3599c322e6132 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 429c5b93ff66e82fa3fd65475489fde133c66002 (diff) | |
| parent | 6ae3fe184c6f2e402bfc452589b8cce7fc3f46a5 (diff) | |
Merge branch \'stage-aosp-master\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master am: c74dd7fcb1
am: 6ae3fe184c -s ours
* commit '6ae3fe184c6f2e402bfc452589b8cce7fc3f46a5':
Use std::unique_ptr instead of UniquePtr.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions