OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Mon, 7 Oct 2013 14:52:23 +0000 (07:52 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 7 Oct 2013 14:52:23 +0000 (07:52 -0700)

Trivial merge