commit | 1d87676b8244bc2683576f139efa98d4b536e7dc | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Mon Mar 03 21:21:35 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 03 21:21:35 2014 +0000 |
tree | f4a1db31832aeac81fd08a4ca53ac1e6924f2054 | |
parent | 684dbdf316a02cf6a7694018f7c3a4bcd65142cc [diff] | |
parent | 706efb2254b68a6cd2441b519dd8445ca3df362d [diff] |
am 706efb22: resolved conflicts for merge of 83755972 to klp-modular-dev-plus-aosp * commit '706efb2254b68a6cd2441b519dd8445ca3df362d': Add SELinux restorecon calls on ASEC containers.