am 70bbbd32: Merge "More flexible intent extra parsing." into lmp-mr1-dev
am 70bbbd32: Merge "More flexible intent extra parsing." into lmp-mr1-dev

* commit '70bbbd32beefbb8e5c2e2dfa7a417274f80e2da2':
  More flexible intent extra parsing.

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