OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Thu, 7 Jun 2012 14:49:26 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 7 Jun 2012 14:49:26 +0000 (07:49 -0700)

Trivial merge