From: Zoltan Szatmary-Ban <szatmz@google.com>
Date: Wed, 8 Jul 2015 15:16:29 +0000 (+0000)
Subject: am 87e918cd: am 2f279c3a: am 2cd50c45: am 03b73068: am 296e0aff: Merge "Filter USB... 
X-Git-Tag: android-x86-7.1-r1~2317
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f601bec35e2d7cce9d7899520d0332739f29cc42;p=android-x86%2Fpackages-apps-Settings.git

am 87e918cd: am 2f279c3a: am 2cd50c45: am 03b73068: am 296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev

* commit '87e918cdf0ff92c8beee43b9f0be514d608c7b4c':
  Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
---

f601bec35e2d7cce9d7899520d0332739f29cc42