OSDN Git Service

Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile" am: 7dd909684f...
authorJack He <siyuanh@google.com>
Fri, 2 Dec 2016 05:17:12 +0000 (05:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 05:17:12 +0000 (05:17 +0000)
am: 133de5dce0

Change-Id: Id4015a6ff7bfc492181c9e81feadfa66580fbf40

1  2 
core/res/AndroidManifest.xml

Simple merge