merge in jb-mr1-factory-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Wed, 10 Oct 2012 15:56:12 +0000 (08:56 -0700)
committerThe Android Automerger <android-build@android.com>
Wed, 10 Oct 2012 15:56:12 +0000 (08:56 -0700)

Trivial merge