merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Tue, 23 Oct 2012 23:47:11 +0000 (16:47 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 23 Oct 2012 23:47:11 +0000 (16:47 -0700)
commitfdc1efa489f99dde9f7d2f733e6181686c31bf44
treec2190cb7dac152098811a4fd63639117e99f47f6
parenta0648fc71e705cf211caa991639e2a559e1498d9
parent3a3606738c9eceacb06fd3d135b7a9cef2475ec8
merge in jb-mr1-release history after reset to jb-mr1-dev