Update for Lollipop.
Merge branch 'master' of https://github.com/LarkspurCA/androidweardocs

Incorporate update from contributor.