tree 9bef3f305fcd1c2a083098e5c4b4cd7a2beb62e7
parent dccb6af5225de6776483fe7771778b840363bfdb
parent 80fe5f150070262ef6e36f2910215457e89dc8a1
author Stephen Smalley <sds@tycho.nsa.gov> 1440652208 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440652208 +0000

am 80fe5f15: (-s ours) am 82216295: libselinux: fail hard on invalid property_contexts entries

* commit '80fe5f150070262ef6e36f2910215457e89dc8a1':