Commit 74e951f7 authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am 5551c39d: resolved conflicts for merge of 7c2acc7d to jb-mr2-dev 

* commit '5551c39d':
  Assert that xattr support is in the kernel.
parents 5b4786e7 5551c39d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment