merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Tue, 23 Oct 2012 13:59:34 +0000 (06:59 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 23 Oct 2012 13:59:34 +0000 (06:59 -0700)
commit3a3606738c9eceacb06fd3d135b7a9cef2475ec8
tree8f2be0f12176af36d13f13e072fe07de39f2abae
parent3c17a3f79068fef751c777a7c13830d23e5f51cf
parent69ab5164afafc7b6e08a063d734131926107c86f
merge in jb-mr1-release history after reset to jb-mr1-dev