tree facee9b4614ea7bcb333e256df79d866493bc1ea
parent dced76f8c87cbdccf7cb185ac0486dc666dd4164
parent 2d045d78fdbc6091af11771746d739418081ae32
author The Android Open Source Project <initial-contribution@android.com> 1370303019 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1370303019 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I0a3ac3cb5efeae22ac8034653d6e352e6cc5579a