tree 007bbb0187b9af1ca4305c6d91a0ef3a1343feb1
parent b0f96e9d93e2c96caa95186164f655009a8e8f60
parent 3bf04bd4f04b217768b3799dadb4a775b5a31f1a
author Martijn Coenen <maco@google.com> 1337293802 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1337293802 -0700

Merge "Allow cancelling of Bluetooth Beam transfers." into jb-dev