OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Thu, 25 Oct 2012 14:56:40 +0000 (07:56 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 25 Oct 2012 14:56:40 +0000 (07:56 -0700)

Trivial merge