OSDN Git Service

Merge "Protect broadcast used in settings for bond cancel" am: 5cfbbce162
authorMarie Janssen <jamuraa@google.com>
Mon, 12 Jun 2017 22:57:58 +0000 (22:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Jun 2017 22:57:58 +0000 (22:57 +0000)
commit297dbb86fed9075b3124583d8b9f9684a1357392
tree452842561f9d2cbfc91895e39466c13efe694996
parentf96c9a0fa22a5b5230b91749bcf2490e892a864e
parent00bce50dc36fb1d2ea6f028f498728385e1e1e28
Merge "Protect broadcast used in settings for bond cancel" am: 5cfbbce162
am: 00bce50dc3

Change-Id: I4235d63f1c9aeb3be8b276c082d707e20f8c1d9a
core/res/AndroidManifest.xml