OSDN Git Service

Merge "First cut at Bluetooth Beam"
authorMartijn Coenen <maco@google.com>
Wed, 4 Apr 2012 23:51:40 +0000 (16:51 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 4 Apr 2012 23:51:40 +0000 (16:51 -0700)

Trivial merge