OSDN Git Service

Merge branch \'stage-aosp-master\' of /usr/local/google/game/mirror/googleplex-androi...
authorDan Albert <danalbert@google.com>
Thu, 5 Nov 2015 19:56:57 +0000 (19:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 Nov 2015 19:56:57 +0000 (19:56 +0000)
commit6ae3fe184c6f2e402bfc452589b8cce7fc3f46a5
treeb2666280aa1029e5a594fbef024520b211ff45f1
parentdd6d2fa5c78bc86d56321244fb2ac33e9f86c761
parentc74dd7fcb128e9a1465c1a91a91a851c3386a955
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