OSDN Git Service

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

Change-Id: Ia608d4af6afda14097a94013bf2dbe64962ebd74


Trivial merge