merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Fri, 12 Oct 2012 13:59:32 +0000 (06:59 -0700)
committerThe Android Automerger <android-build@android.com>
Fri, 12 Oct 2012 13:59:32 +0000 (06:59 -0700)

Trivial merge