OSDN Git Service

Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into...
authorAndrew Rossignol <aarossig@google.com>
Thu, 12 Jan 2017 19:08:24 +0000 (19:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Jan 2017 19:08:24 +0000 (19:08 +0000)
am: 6ebc52a950  -s ours

Change-Id: I1ae4fb72bc6a5576dfb3894f8b24e529cd52e0a6


Trivial merge