| commit | d5866c4e9af7c1af88a5bd18f27f6b00908f7533 | [log] [tgz] |
|---|---|---|
| author | Cameron Neale <cdneale@google.com> | Tue Oct 21 20:29:52 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Oct 21 20:29:53 2014 +0000 |
| tree | f5e158599a6d3e2dc1b7f52d2d597a0255b615c0 | |
| parent | c02ccbc8c5efb8502c6168e1b6f635d882bfcc51 [diff] | |
| parent | 9a8573250bbe0df0af0d275cb188bf9db7942e6f [diff] |
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