OSDN Git Service

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

Trivial merge