OSDN Git Service

am 2cd50c45: am 03b73068: am 296e0aff: Merge "Filter USB options on chooser when...
authorZoltan Szatmary-Ban <szatmz@google.com>
Wed, 8 Jul 2015 12:25:55 +0000 (12:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Jul 2015 12:25:55 +0000 (12:25 +0000)
commit2f279c3a12e58806d8efb48bbeef031842a0ed80
treead4a2c0cb6076f32f9a053cca5ac4842d3be36e7
parent89be2eeab0738e7db8d945ff1267dc9bf8fdaeb2
parent2cd50c45da99fa002375ad80a51d0c672cc09572
am 2cd50c45: am 03b73068: am 296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev

* commit '2cd50c45da99fa002375ad80a51d0c672cc09572':
  Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on