Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Sep 2012 17:12:41 +0000 (10:12 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Sep 2012 17:12:41 +0000 (10:12 -0700)
commit6f90bbaa2419d0ed62099113fd44d0ea179053d2
treefa8a093d9f1c67b4a3e1f05552eae92164a7b8f5
parentb953ee560f6b307b516f9a24a0ec59d16c41ff2f
parent79a06e503b565ee52b4652cb1b8c4c41485ccffb
Reconcile with jb-mr1-release - do not merge

Change-Id: Ib0e59d17038dfd036893ef11e3f4ba2005f525a8