merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Sat, 22 Sep 2012 16:42:07 +0000 (09:42 -0700)
committerThe Android Automerger <android-build@android.com>
Sat, 22 Sep 2012 16:42:07 +0000 (09:42 -0700)

Trivial merge