merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Fri, 19 Oct 2012 13:59:48 +0000 (06:59 -0700)
committerThe Android Automerger <android-build@android.com>
Fri, 19 Oct 2012 13:59:48 +0000 (06:59 -0700)
commit69ab5164afafc7b6e08a063d734131926107c86f
tree6bd3bc9535925526eb33e6d1dd57b55907ab4e72
parent92b0aadb2237196ee193c6500c6f864c8497c97a
parent3e32225e8356e5c8ce0c482c8f92ccf0859c4c29
merge in jb-mr1-release history after reset to jb-mr1-dev