OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Wed, 31 Jul 2013 19:29:01 +0000 (12:29 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 31 Jul 2013 19:29:01 +0000 (12:29 -0700)

Trivial merge