| commit | ed25e4e1082b7be9e6a4c3163168ced0d576ddc3 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu Aug 27 05:10:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:10:08 2015 +0000 |
| tree | 9bef3f305fcd1c2a083098e5c4b4cd7a2beb62e7 | |
| parent | 0ed252efdaa41918932dc58a6c1d19c4a56cc943 [diff] | |
| parent | d59496a015f53251171cb19b300fec25d755fe41 [diff] |
am d59496a0: (-s ours) am 2ef4270c: Merge "libselinux: fail hard on invalid file_contexts entries" * commit 'd59496a015f53251171cb19b300fec25d755fe41':