Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Oct 2012 14:34:29 +0000 (07:34 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Oct 2012 14:34:29 +0000 (07:34 -0700)
commitbdbc067685bf527617f5e6d7643ef5836d28655f
tree680a7e13cd0674ec555fd68e636d64b7f94d080e
parent0be79edc94ce774a83506d3b404c9df82302c12a
parent36b1ce5aea09ec497b88c49ddd7289099c913bbe
Reconcile with jb-mr1-release - do not merge

Change-Id: Ib5e744d8e5e05f06065f7650ac51590af9ad2a9e