tree e53e6deaab753b1e7430d072e2fde63d44a43936
parent 80fb68181e2a396de97c3d1b2d7c9e736cec4417
parent 0ed4bd5e22055d86268f4092c23a30b01a3ece0f
author The Android Open Source Project <initial-contribution@android.com> 1349792881 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349792881 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I692d63796f64702243898ae1d20d8ce073dc15e6