commit | e32c995b1b14ea670626ebf651a0fc45ed2c8c00 | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Tue Mar 18 18:34:04 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 18 18:34:04 2014 +0000 |
tree | 23970c23dda20b7a0826fbdb252c4691b771fb10 | |
parent | e0f2066d900f7b02d63380faba66415e841f8dd8 [diff] | |
parent | 74e951f766ebe5c37e93a56d85d4400d5abbf64e [diff] |
am 74e951f7: am 5551c39d: resolved conflicts for merge of 7c2acc7d to jb-mr2-dev * commit '74e951f766ebe5c37e93a56d85d4400d5abbf64e': Assert that xattr support is in the kernel.