OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Sat, 1 Mar 2014 13:51:09 +0000 (05:51 -0800)
committerThe Android Automerger <android-build@google.com>
Sat, 1 Mar 2014 13:51:09 +0000 (05:51 -0800)

Trivial merge