am 7a5eebd3: resolved conflicts for merge of c423b1aa to lmp-mr1-dev

Browse source

* commit '7a5eebd3c3a8a5465beed649e3be64928fb09bae':
  Add neverallow checking to sepolicy-analyze.

...

This commit is contained in:

dcashman 2015-02-06 16:36:32 +00:00 committed by Android Git Automerger

parent 4cf236decb 7a5eebd3c3

commit eca25e8eef

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 Expand all files Collapse all files

Diff content is not available