tree d30364f1cd437840f08c13ddb1d6fe7913a9bdec
parent dba56d0812f3f769c7006b65ee27b920bc4f2672
parent cdc7e3f4eeda205d82afbba0be5675fb7700910a
author The Android Open Source Project <initial-contribution@android.com> 1369151960 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1369151960 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I0aa0d8aac380b7cf08b0fcefe06005c7903bf21a