tree cf518236c3786b7e27e711e219836fdf1cf845f9
parent c15624c76286a15d127136306f53f1105a9ccc51
parent de5b622335ccfbe24aaa11447edde3463350a074
author The Android Open Source Project <initial-contribution@android.com> 1352925692 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352925692 -0800

Reconcile with jb-mr1.1-release - do not merge

Change-Id: Ie11bc98347697a21a3cb79d5da8138b8e7bebb32