OSDN Git Service

Merge "Merge "Protect broadcast used in settings for bond cancel" into oc-dev am...
authorMarie Janssen <jamuraa@google.com>
Tue, 13 Jun 2017 01:54:18 +0000 (01:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 01:54:18 +0000 (01:54 +0000)
commit0c5fe772eafff17a0da320ae85d657dfb6196c43
treec3591057b1afcf7e3351cf529147a2d4f9637b54
parent07e904e873a0df02af6d40de407753dc714bb0ab
parentd681a81d89e1ce0cfc3b963db6c0afe870e534ee
Merge "Merge "Protect broadcast used in settings for bond cancel" into oc-dev am: 68a4c91bb4 am: 2ddb92f2d9" into oc-dr1-dev-plus-aosp
am: d681a81d89

Change-Id: Ic8891f09e36a7610418c8168722628e60c079131