OSDN Git Service

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

Trivial merge