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

Trivial merge