tree bf9c6f64847c81fc9cd98fbd4f32c5f9986185b7
parent dce21a59d9793551abd08ad852714894a1b0d19d
parent 9c7ee73d9c46d7338ce2881285bd38792c5e570f
author The Android Open Source Project <initial-contribution@android.com> 1370293370 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1370293370 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I29c033be91cbfe80951c043ac96208d894fbda60