tree 82ef197225b78784008de5facc2dafdb8c0ef383
parent 207928c0d3da016f79bfaafcbf9695f49fe44f6f
parent 6fdfaf5837acd52f85b2df1b2d90d8d21a32335f
author Martijn Coenen <maco@google.com> 1337294014 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337294014 -0700

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

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