Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only am: edd8dc83d5 am: 4cb8e2de6f" into nyc-mr1-dev-plus-aosp

am: d344b407df

Change-Id: Ie75c36576a821c7faa720bfae54d47b5e5560f85
This commit is contained in:
Christopher Tate
2016-10-13 19:24:50 +00:00
committed by android-build-merger

Diff Content Not Available