OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Fri, 6 Sep 2013 18:31:38 +0000 (11:31 -0700)
committerThe Android Automerger <android-build@google.com>
Fri, 6 Sep 2013 18:31:38 +0000 (11:31 -0700)

Trivial merge