merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Fri, 26 Oct 2012 23:22:58 +0000 (16:22 -0700)
committerThe Android Automerger <android-build@android.com>
Fri, 26 Oct 2012 23:22:58 +0000 (16:22 -0700)
commit32d8a9b71910daa5e56da13f7fc5c5e88f6f6559
tree69b50c591a2260216f0f4c4efebc07edfb247f32
parent34d2b94a1d314524aa47d1c9071d9b5027332d65
parent74313053966566fa50c7d31a4a26e8bf55325719
merge in jb-mr1-release history after reset to jb-mr1-dev