OSDN Git Service

Merge "Protect broadcast used in settings for bond cancel" am: 5cfbbce162 am: 00bce50dc3
authorMarie Janssen <jamuraa@google.com>
Tue, 13 Jun 2017 00:36:46 +0000 (00:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 00:36:46 +0000 (00:36 +0000)
commitf1b9ee029d309264c3e199e2a3ebc5a67a8943df
tree267cfdbe87f13e1c2e4a4cd25a80e3f58fea592c
parent10e0b425bc3d23a7bec92e1eed49cbdd5f05fc78
parent297dbb86fed9075b3124583d8b9f9684a1357392
Merge "Protect broadcast used in settings for bond cancel" am: 5cfbbce162 am: 00bce50dc3
am: 297dbb86fe

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