merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Fri, 26 Oct 2012 23:22:58 +0000 (16:22 -0700)
committerThe Android Automerger <android-build@android.com>
Fri, 26 Oct 2012 23:22:58 +0000 (16:22 -0700)

Trivial merge