am 706efb22: resolved conflicts for merge of 83755972 to klp-modular-dev-plus-aosp

Browse Source

* commit '706efb2254b68a6cd2441b519dd8445ca3df362d':
  Add SELinux restorecon calls on ASEC containers.

gugelfrei

Nick Kralevich 10 years ago committed by Android Git Automerger

parent 684dbdf316 706efb2254

commit 1d87676b82

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

Diff Content Not Available