OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Mon, 7 Jan 2013 15:49:31 +0000 (07:49 -0800)
committerThe Android Automerger <android-build@android.com>
Mon, 7 Jan 2013 15:49:31 +0000 (07:49 -0800)

Trivial merge