merge in jb-mr1-factory-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Fri, 12 Oct 2012 17:26:55 +0000 (10:26 -0700)
committerThe Android Automerger <android-build@android.com>
Fri, 12 Oct 2012 17:26:55 +0000 (10:26 -0700)

Trivial merge