tree 2141a3770ea8b626f5b66e331bf70c8911debda7
parent 025aecc7180d09b73220c1218fcc002d00f2d6a2
parent 88b58dc4f13e6cad92f4f77927e410029aefeed9
author The Android Open Source Project <initial-contribution@android.com> 1345590467 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1345590467 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Ic385ef16d6d685014334b320ddb7f1929c34bfd3