tree 5d189a7d2adc426550a3cb2a9bc54f671b66d888
parent 00ee711d096ddc600ac3ea61f11c97f1a44a1e34
parent 4646e4c581d3610f9ed68b03d856b5d930cfee9b
author Nick Kralevich <nnk@google.com> 1481561363 +0000
committer android-build-merger <android-build-merger@google.com> 1481561363 +0000

Merge "service_manager.c: remove is_selinux_enabled calls" am: fce768d017
am: 4646e4c581

Change-Id: I63a9f27535b2781de7d050071443d7fe73883de7