YQ-DemoGit / base / 7a10a986c5e - Bitbucket

Commits

Dan Albert authored and android-build-merger committed 7a10a986c5eM06 十一月 2015

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

Showing diff to6ae3fe184c6