tree 312da5c83ac7f6c3cdb656e34c3f42378ead4b33
parent 6a199b79c6e61e6e6aedb221ec9c78c68fbffb9a
parent 8e60eb9eb40f2247cbd92ce2efccb9a94fe5b591
author Divya Sharma <c_shard@codeaurora.org> 1434045148 -0700
committer Divya Sharma <c_shard@codeaurora.org> 1434416099 -0700

Merge tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1.05.01.01.066.196' into HEAD

AU_LINUX_ANDROID_LA.BF64.1.2.1.05.01.01.066.196 based on quic

* tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1.05.01.01.066.196':
  sepolicy: add selinux policy for FIPS enablement
  sepolicy: Add adsrpc permission to camera daemon
  sepolicy: clean up seempd rules
  SEAndroid: Adding NFC specific policies

Change-Id: I13a898261f96b01a3d835667757e8e42fca31a1b