merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Thu, 25 Oct 2012 20:42:28 +0000 (13:42 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 25 Oct 2012 20:42:28 +0000 (13:42 -0700)
commit74313053966566fa50c7d31a4a26e8bf55325719
tree8105a6761f4b6576ea574afd30cfed31e533a7d0
parentc48f0170bf56ff4911998bc531e8547bcf0d024f
parentef5aa7147f501eb97ec5f3b53dc7c0b34d986b8b
merge in jb-mr1-release history after reset to jb-mr1-dev