tree 51c79a4d8ee1115b2d3248858ee05973c7ec254d
parent 81befcaad462ea93d3683339232898b96185999e
parent 0ac6e4efb267b3c22938bcbfcd6935009566a449
parent 0ac6e4efb267b3c22938bcbfcd6935009566a449
author The Android Open Source Project <initial-contribution@android.com> 1352233137 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352233137 -0800

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I2cc359dc6ba475b9fff93cb18cb9a1c43d6e3acb