OSDN Git Service

Merge "Removing duplicated and/or unused resources from WallpaperPicker that conflict...
authorCameron Neale <cdneale@google.com>
Tue, 21 Oct 2014 20:29:52 +0000 (20:29 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 21 Oct 2014 20:29:53 +0000 (20:29 +0000)

Trivial merge