tree ab7e62aaacf3dfe60c56684cfba7be317bc9e64d
parent 5f1a938e9c65829c3afebb4d92c8e93caecc3e11
parent 149cbfdafe6e5a17202994609cd9c248fbee5e36
author The Android Open Source Project <initial-contribution@android.com> 1369151971 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1369151971 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I7aa2dccba44773db134e6bef703ff9477ed159ba