tree 9a9119cc5a290071c03d9cf539b6205491c886ef
parent b06969a69fda8e4a6c48a4cc787be92cb78f5534
parent 8fc9bc570474c7f76638529e2b98248775c0d5d8
author Lorenzo Colitti <lorenzo@google.com> 1432115293 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432115293 +0000

am 8fc9bc57: Merge "Disable certain kernel configuration options in net_test."

* commit '8fc9bc570474c7f76638529e2b98248775c0d5d8':
  Disable certain kernel configuration options in net_test.