OSDN Git Service

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

Trivial merge