diff options
author | Nick Kralevich <nnk@google.com> | 2015-02-06 15:28:06 -0800 |
---|---|---|
committer | Nick Kralevich <nnk@google.com> | 2015-02-06 15:28:06 -0800 |
commit | fdc7b6b4d325827ddf8791ab7cd33f7048240ad3 (patch) | |
tree | 55d7f06285c8c4f5589daae72c0bed92de54075c /BoardConfig.mk | |
parent | 0589042c511d724169d122669e17d70025a11f20 (diff) | |
parent | 3671f7fef780d407b94e10867a7734f80f171cc3 (diff) | |
download | shamu-fdc7b6b4d325827ddf8791ab7cd33f7048240ad3.tar.gz |
resolved conflicts for merge of 3671f7fe to lmp-mr1-dev-plus-aosp
Change-Id: I4a65e989bb330d8052c97f5d5d8c69c65b659727
Diffstat (limited to 'BoardConfig.mk')
-rw-r--r-- | BoardConfig.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index d025af71..baaf6d4f 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -125,6 +125,7 @@ BOARD_SEPOLICY_UNION += \ file.te \ gsiffd.te \ ims.te \ + init.te \ irsc_util.te \ mdm_helper.te \ mediaserver.te \ |