merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Thu, 25 Oct 2012 20:42:28 +0000 (13:42 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 25 Oct 2012 20:42:28 +0000 (13:42 -0700)

Trivial merge