tree 4cbde583c4a37a3cad36bc531c87a331d2fe06de
parent 2eab1f762badb7ba46b95716e62ea4548a979903
parent 006feb0aafa681b3f90eca8cafe80caeab8101f4
author The Android Open Source Project <initial-contribution@android.com> 1343685945 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1343685945 -0700

Reconcile with jb-mr1-release

Change-Id: Iba2b369e6c6e79c79ca38617bb5ff58edcbface2