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:49:30 +0000 (01:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 01:49:30 +0000 (01:49 +0000)
commit795439484cd6e7c8edc9dfa8500035df5d3b633c
treec3591057b1afcf7e3351cf529147a2d4f9637b54
parente8c6f1a33f42c0a7d5c9b909477d9c58d021eddd
parent61c6f9f2044ddeeb4043f4b7924c381c09b2f6e7
Merge "Merge "Protect broadcast used in settings for bond cancel" into oc-dev am: 68a4c91bb4 am: 4c342c8a98" into oc-dr1-dev-plus-aosp
am: 61c6f9f204

Change-Id: I883466888853a4914c87ab99ec81795d2af95123