tree cf51b65b921a0ee1c958906d5b4d844b84dddaa5
parent ca905c87c38fe0af3b815e8e78b86a1a7788a1a9
parent 82ec7fa34c7dcc6ced22ff3fcfabed6f2b64cc23
author The Android Open Source Project <initial-contribution@android.com> 1364575768 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1364575768 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I4968560235c530e5fb59ed2ed1f7c196bc521372