am d6c1e498: Merge "Migrate stream extras in CHOOSER intents." into jb-dev
am d6c1e498: Merge "Migrate stream extras in CHOOSER intents." into jb-dev

* commit 'd6c1e49847ed5389e8917ff315c91b89493ebe9f':
  Migrate stream extras in CHOOSER intents.

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