merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Thu, 11 Oct 2012 14:03:58 +0000 (07:03 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 11 Oct 2012 14:03:58 +0000 (07:03 -0700)
commitc5e58287dab5868372fcfa662be1e27ddf001fdc
tree661b1db41e8b0ec1e728d75917b3a042b7af5a1e
parent3f32ce537a7870cff6ca32e34a8d965d2fa85172
parent14cfaecae07434b1e36cbc41e84011cdcdb9cd37
merge in jb-mr1-release history after reset to jb-mr1-dev