tree e7420537e8f765f11edcf6edef6f6517891b495c
parent 64eae4f3c6c40675bd452714763748393d9a53a4
parent 0839ae958f8e883e77aae14323a31e98a14e0c00
author The Android Open Source Project <initial-contribution@android.com> 1368708198 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1368708198 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: Ifd47b9ed799076e9dc5141889f1de6c295286a2a