commit | 674bf8bddde64df70c174c01ee1d5228ff4f6b28 | [log] [tgz] |
---|---|---|
author | dcashman <dcashman@google.com> | Fri Feb 06 16:48:53 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 06 16:48:53 2015 +0000 |
tree | 8a6cd7a5fcdb1a12809eca83f07cb13137a61072 | |
parent | 2117750677793adbc65199c527b439582d689259 [diff] | |
parent | 65b73f78879acd4336726a0242b8bf6491fdf094 [diff] |
am 65b73f78: am 0f37a9d0: resolved conflicts for merge of 30044c61 to lmp-mr1-dev * commit '65b73f78879acd4336726a0242b8bf6491fdf094': Change SELinux neverallow tests to be sepolicy-analyze based.