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)
commit4e06743f218ce996c9774c49812b0d9c9de6e469
tree00862068f50bdde37df8b651a6435667915d349e
parenta915a88cfb8056d3226146c881f197f416f97450
parent1270b399cc9ccb1d20f4281819df233f95442e28
Merge "Merge "Protect broadcast used in settings for bond cancel" am: 5cfbbce162 am: 00bce50dc3 am: 297dbb86fe" into oc-dr1-dev-plus-aosp
am: 1270b399cc

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