OSDN Git Service

Merge "Merge "Protect broadcast used in settings for bond cancel" am: 5cfbbce162...
authorMarie Janssen <jamuraa@google.com>
Tue, 13 Jun 2017 01:01:23 +0000 (01:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 01:01:23 +0000 (01:01 +0000)
am: 1270b399cc

Change-Id: I77469544f4cd29f2393e4310ff83ed1da4d5ecfe

1  2 
core/res/AndroidManifest.xml

Simple merge