tree f1f478e48d573997481f01b825f536d66c29a40f
parent dbf6ad0692f98cacf27dc023854b2c5a5575a841
parent 0bd5415fa07863509a27652629ae56de40d958d3
parent 75874cac148ed584368cd1d73fce70af3719dfe3
author The Android Open Source Project <initial-contribution@android.com> 1346101849 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1346101849 -0700

Reconcile with jb-mr0-release jb-release - do not merge

Change-Id: Ibe50742a45ef532acf13f4edb8166b6e6c1ef30c