Commit 85b13966 authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am de8b667a: am cd8879e7: Merge "fix KernelSettingsTest#testXattrInKernel" 

* commit 'de8b667a':
  fix KernelSettingsTest#testXattrInKernel
parents 2ea8f848 de8b667a
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