tree d8873443de0aff8cd1b2b8af8eba0a62f80bffb1
parent 50b21d22604e9a3599fbb610df827a3ed949ac6c
parent 8f2a9e4dbfc6a475f70e791123bebb56a5a94e29
author Sunny Goyal <sunnygoyal@google.com> 1425325390 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425325390 +0000

am 8f2a9e4d: Merge "Cleaning up some resources in WallpaperPickerActivity" into ub-launcher3-burnaby

* commit '8f2a9e4dbfc6a475f70e791123bebb56a5a94e29':
  Cleaning up some resources in WallpaperPickerActivity