merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Wed, 22 Aug 2012 13:33:58 +0000 (06:33 -0700)
committerThe Android Automerger <android-build@android.com>
Wed, 22 Aug 2012 13:33:58 +0000 (06:33 -0700)
commit13621c08703e1cdedbe4c2ceff236321ba7e2b59
treea58cafb77a2b8d0c0d9b078ddff3e8b163fa5abe
parent4ed2f10326c52005dffdbfdc890f9c31f5a06dc7
parent33d953cdf0d2dcae26d6464917cd7eed09c2fe30
merge in jb-mr1-release history after reset to jb-mr1-dev