commit | 0947860faf6b8565735fad5158f343ffe3661057 | [log] [tgz] |
---|---|---|
author | Martijn Coenen <maco@google.com> | Thu May 17 15:33:34 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 17 15:33:34 2012 -0700 |
tree | 82ef197225b78784008de5facc2dafdb8c0ef383 | |
parent | 207928c0d3da016f79bfaafcbf9695f49fe44f6f [diff] | |
parent | 6fdfaf5837acd52f85b2df1b2d90d8d21a32335f [diff] |
am 6fdfaf58: am 4bfe5662: Merge "Allow bluetooth OPP transfers to be stopped." into jb-dev * commit '6fdfaf5837acd52f85b2df1b2d90d8d21a32335f': Allow bluetooth OPP transfers to be stopped.