am a09c20a2: am a457211a: Merge "Fix getBuiltInWallpaper method" into klp-dev
am a09c20a2: am a457211a: Merge "Fix getBuiltInWallpaper method" into klp-dev

* commit 'a09c20a23038c1d77ae3d511da18a377572aed0c':
  Fix getBuiltInWallpaper method

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base