| commit | 6fdfaf5837acd52f85b2df1b2d90d8d21a32335f | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Wed May 16 15:54:37 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 16 15:54:37 2012 -0700 |
| tree | 82ef197225b78784008de5facc2dafdb8c0ef383 | |
| parent | 63397ede92efd0a31bde340bc301eb3962e3f195 [diff] | |
| parent | 4bfe5662b7169484d32186a2042cb88cdbc446ba [diff] |
am 4bfe5662: Merge "Allow bluetooth OPP transfers to be stopped." into jb-dev * commit '4bfe5662b7169484d32186a2042cb88cdbc446ba': Allow bluetooth OPP transfers to be stopped.