tree e8e4e10b860971df38bc32cc28e20b823c48db58
parent f61904d719a7d48060e78d09dab9f016390b0d77
parent 53ce6ef9e2e5fe235d6a248fdfe97cf5f8ae36e1
author Nick Kralevich <nnk@google.com> 1363807863 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363807863 -0700

am 53ce6ef9: Merge "Revert "SeccompTest: add note about kernels between 3.5 and 3.8""

* commit '53ce6ef9e2e5fe235d6a248fdfe97cf5f8ae36e1':
  Revert "SeccompTest: add note about kernels between 3.5 and 3.8"