summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorCameron Neale <cdneale@google.com>2014-10-21 20:29:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-21 20:29:53 +0000
commitd5866c4e9af7c1af88a5bd18f27f6b00908f7533 (patch)
treef5e158599a6d3e2dc1b7f52d2d597a0255b615c0 /res
parentc02ccbc8c5efb8502c6168e1b6f635d882bfcc51 (diff)
parent9a8573250bbe0df0af0d275cb188bf9db7942e6f (diff)
downloadandroid_packages_apps_Trebuchet-d5866c4e9af7c1af88a5bd18f27f6b00908f7533.tar.gz
android_packages_apps_Trebuchet-d5866c4e9af7c1af88a5bd18f27f6b00908f7533.tar.bz2
android_packages_apps_Trebuchet-d5866c4e9af7c1af88a5bd18f27f6b00908f7533.zip
Merge "Removing duplicated and/or unused resources from WallpaperPicker that conflict with Launcher 3 resources. The resource duplicated between the two is now only held within Launcher3. These changes are necessary in order for GSA to build in Google3." into ub-now-master
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions