OSDN Git Service

am 909ddcca: (-s ours) am 296e0aff: Merge "Filter USB options on chooser when DISALLO...
authorZoltan Szatmary-Ban <szatmz@google.com>
Thu, 27 Aug 2015 11:31:07 +0000 (11:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:31:07 +0000 (11:31 +0000)
commitdc8fcbabe7b82a2f4af8d161f15ca57e05231024
tree7f84c40aaa75cd61f165f55c1ed04452351a1edd
parent1a04072c47cbaa253efdd6d1b8d1113c1cdf9f03
parent909ddcca43803078c838da0c6b9a9c84ddb715a6
am 909ddcca: (-s ours) am 296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev

* commit '909ddcca43803078c838da0c6b9a9c84ddb715a6':