merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Wed, 15 Aug 2012 13:34:29 +0000 (06:34 -0700)
committerThe Android Automerger <android-build@android.com>
Wed, 15 Aug 2012 13:34:29 +0000 (06:34 -0700)

Trivial merge