tree 51bac729f7186c76f114019f891c6388dc2022b7
parent d270339f90c948c29d4346ec7e263694daa0a346
parent 2f5608069b36e255774276d54b52695a5423d4d7
author The Android Open Source Project <initial-contribution@android.com> 1352130988 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352130988 -0800

Reconcile with jb-mr1-release - do not merge

Change-Id: I4b74d2eaaf4c3d80493ae2f73ffde05bc9a0c381