merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Sun, 7 Oct 2012 13:59:31 +0000 (06:59 -0700)
committerThe Android Automerger <android-build@android.com>
Sun, 7 Oct 2012 13:59:31 +0000 (06:59 -0700)
commit36fe3a1bea493e45edb3c9e2729590592018a078
treebf68487690e7e3f6b38a30c18f49468a2c554717
parentddf663f88ed7c4729a55a0b4519b2138adf154de
parentf5cffcd05c6d374e20ff0b09bad66d2dc1e8ddbf
merge in jb-mr1-release history after reset to jb-mr1-dev