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: 77315a99
* commit '77315a99':
Change-Id: I388b44a99cd33a3eff8a7b958b606fd92ab9d673