From: Marie Janssen <jamuraa@google.com>
Date: Tue, 13 Jun 2017 01:01:23 +0000 (+0000)
Subject: Merge "Merge "Protect broadcast used in settings for bond cancel" am: 5cfbbce162... 
X-Git-Tag: android-x86-9.0-r1~2811
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4e06743f218ce996c9774c49812b0d9c9de6e469;p=android-x86%2Fframeworks-base.git

Merge "Merge "Protect broadcast used in settings for bond cancel" am: 5cfbbce162 am: 00bce50dc3 am: 297dbb86fe" into oc-dr1-dev-plus-aosp
am: 1270b399cc

Change-Id: I77469544f4cd29f2393e4310ff83ed1da4d5ecfe
---

4e06743f218ce996c9774c49812b0d9c9de6e469