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

* commit 'a0ce8c92cfd06af14962bfba120bd176c936d4f0':
  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