tree 95f8b3ee4cb1ee84005fb30905219bea835d3202
parent 7841c35b18374dc295024d1022253d453aa501e3
parent 189b9916d30115c21ca8c240cfdca154268a1539
author The Android Open Source Project <initial-contribution@android.com> 1348162516 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1348162516 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Icd29eabf837375f635c5397491ccfbed124d8337