OSDN Git Service

am 36a38281: am 8fc9bc57: Merge "Disable certain kernel configuration options in...
authorLorenzo Colitti <lorenzo@google.com>
Wed, 20 May 2015 13:17:23 +0000 (13:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 20 May 2015 13:17:23 +0000 (13:17 +0000)
* commit '36a382814099d1a4efeacb9be8bb8dd8ad1e2587':
  Disable certain kernel configuration options in net_test.


Trivial merge