tree 6dc1344943486d5cef8c7d33a57a68bebecf910d
parent 79f58996c5d937d27611e9a10ec5ff6550ad4245
parent 0b2a7ca5cad1ddbdfb83ce0d97b143a15aa7c329
author The Android Open Source Project <initial-contribution@android.com> 1365032600 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1365032600 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: If51129696a3a4c3495ef07f2e74f854a9409013d