tree 1d7acad4264c41a942328475ccea837b804b6f45
parent 5e4171078e8caf8cb1e6b64ab2a6f14407c23bfa
parent e27b930bc83c6dd25eea7fff337bcde799d86557
author The Android Open Source Project <initial-contribution@android.com> 1348506737 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1348506737 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I23eff659df50eda339492319a1d92c11558f34a4