OSDN Git Service

Merge "Protect broadcast used in settings for bond cancel" into oc-dev
authorMarie Janssen <jamuraa@google.com>
Tue, 13 Jun 2017 00:51:09 +0000 (00:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 00:51:09 +0000 (00:51 +0000)
am: 68a4c91bb4

Change-Id: I3dc46eca98c859c540d528cb8a4a409587a25383


Trivial merge