OSDN Git Service

merge in master-release history after reset to f80bfe5b4aa9a3ccc14276ba9e0e215f6fd8e57f
authorThe Android Automerger <android-build@google.com>
Wed, 7 May 2014 12:50:58 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 7 May 2014 12:50:58 +0000 (05:50 -0700)

Trivial merge