Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into nyc-mr2-dev

am: c65a010a39  -s ours

Change-Id: I39efaeb589830e7d448e208d37a079c798477224
This commit is contained in:
Andrew Rossignol
2017-01-12 18:59:56 +00:00
committed by android-build-merger

Diff Content Not Available