tree f596c33d4e1099c93ed20e7fd6b535b78d967626
parent 1aed82c28f1c81d7d21d112d4122fb5608feaf6d
parent 2f22e71d3a7a8a500b2499ca63286dc7d50c28b7
author The Android Open Source Project <initial-contribution@android.com> 1354124868 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1354124868 -0800

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

Change-Id: Ib1209178390b84af2e57494299fa9320050154e3