tree 45967897d38ad13264883fa3325385230c733518
parent 4942be03fe7bf529f60f228eede31a8559e03655
parent 402da07068333f9393fd960a4c90df39b34bf668
author Martijn Coenen <maco@google.com> 1337208706 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1337208706 -0700

Merge "Bluetooth Beam handover: deal with multi-file transfers." into jb-dev