am 909ddcca: (-s ours) am 296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev

* commit '909ddcca43803078c838da0c6b9a9c84ddb715a6':
This commit is contained in:
Zoltan Szatmary-Ban
2015-08-27 11:31:07 +00:00
committed by Android Git Automerger

Diff Content Not Available