Merge changes Ia9960af9,I6987d60c into oc-dev

am: b9d5d5cc8b

Change-Id: Ie43b0d5ad797501a965ff6f69c37ba619fb5f588
This commit is contained in:
Ruchi Kandoi 2017-04-28 00:30:40 +00:00 committed by android-build-merger
commit d792de481a

View File

@ -3,6 +3,3 @@ hal_server_domain(hal_nfc_default, hal_nfc)
type hal_nfc_default_exec, exec_type, vendor_file_type, file_type;
init_daemon_domain(hal_nfc_default)
# TODO(b/37640900): Remove this one NFC HAL no longer needs access to nfc_data_file:sock_file
typeattribute hal_nfc_default socket_between_core_and_vendor_violators;