diff options
| author | Dan Albert <danalbert@google.com> | 2015-11-05 19:56:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-05 19:56:57 +0000 |
| commit | 6ae3fe184c6f2e402bfc452589b8cce7fc3f46a5 (patch) | |
| tree | b2666280aa1029e5a594fbef024520b211ff45f1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | dd6d2fa5c78bc86d56321244fb2ac33e9f86c761 (diff) | |
| parent | c74dd7fcb128e9a1465c1a91a91a851c3386a955 (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
* commit 'c74dd7fcb128e9a1465c1a91a91a851c3386a955':
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