am 6fdfaf58: am 4bfe5662: Merge "Allow bluetooth OPP transfers to be stopped." into jb-dev

* commit '6fdfaf5837acd52f85b2df1b2d90d8d21a32335f':
  Allow bluetooth OPP transfers to be stopped.