tree dbeccd75957683aa293016e3e65b4308bbbd7596
parent 54ab8f4f52261f074cab5e3b513c610be4a717c5
parent 408149aa6aaf8a7e3f04d2f2e06aaaa830ec4325
author The Android Open Source Project <initial-contribution@android.com> 1354316385 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1354316385 -0800

Reconcile with jb-mr1.1-release - do not merge

Change-Id: I3e6dea054ed56ef2477198ee2082f97433d359c2