OSDN Git Service

am 2f279c3a: am 2cd50c45: am 03b73068: am 296e0aff: Merge "Filter USB options on...
authorZoltan Szatmary-Ban <szatmz@google.com>
Wed, 8 Jul 2015 12:55:35 +0000 (12:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Jul 2015 12:55:35 +0000 (12:55 +0000)
commit87e918cdf0ff92c8beee43b9f0be514d608c7b4c
tree5a55ef582ecaa2255dafb5582e92ed67416d3377
parent8eade69d74639bef1322200d8a8ac7f08bddd7bf
parent2f279c3a12e58806d8efb48bbeef031842a0ed80
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 '2f279c3a12e58806d8efb48bbeef031842a0ed80':
  Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on