Merge "Merge "Collect mime type data correctly for all URIs added to ClipData"...
Merge "Merge "Collect mime type data correctly for all URIs added to ClipData" into nyc-dev am: e06ef946 am: 9d17528e" into nyc-mr1-dev-plus-aosp
am: 82a4cb48
* commit '82a4cb48':
Change-Id: I975e286c84679e808891fd9c9ba18badc2ec7496