| commit | 6ae3fe184c6f2e402bfc452589b8cce7fc3f46a5 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Thu Nov 05 19:56:57 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Nov 05 19:56:57 2015 +0000 |
| tree | b2666280aa1029e5a594fbef024520b211ff45f1 | |
| 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