Merge "Add default lock wallpaper capability and API am: 5d99d47f39 am: d688617d4f" into nyc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2016-05-19 00:20:11 +00:00
committed by Android (Google) Code Review

Diff Content Not Available