tree bdf1f0348d5a9901cfa86498bd7f88f216b6475c
parent 235dc89ebadbb56719e6cec838a49c3aa07b2d1b
parent ba39653eb52ff6646dd7884817c60268ae076e6f
author The Android Open Source Project <initial-contribution@android.com> 1349362080 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349362080 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I7faf49ef059f0f01586b3451426ee59d5778a25f