GitLab

Original patch on Froyo branch:
https://review.source.android.com/#change,18417

Change-Id: I46d7bf0152394f10fdd569bcc9b8cf5e0efc15db