am ed3b804: Merge change 1276 into donut
am ed3b804: Merge change 1276 into donut

Merge commit 'ed3b804f2cc61029cf2969cbfa499ea230c22bb0'

* commit 'ed3b804f2cc61029cf2969cbfa499ea230c22bb0':
  Define mime type for shortcut validation path.

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