merge in jb-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Mon, 30 Jan 2012 15:04:03 +0000 (07:04 -0800)
committerThe Android Automerger <android-build@android.com>
Mon, 30 Jan 2012 15:04:03 +0000 (07:04 -0800)
commitdd1baac376dd707fa9a1ca86bd489785b2c57016
treeb99a95778e0c375277a2fe59de15feb8cdb1c865
parentb1a4b7d41bcc5c89e1123ff0b031efe45512519f
parent1d1274cfcf57394f22bf54a728a53522b89a6864
merge in jb-release history after reset to master