merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Tue, 25 Sep 2012 14:00:01 +0000 (07:00 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 25 Sep 2012 14:00:01 +0000 (07:00 -0700)

Trivial merge