tree 788f7d155be3e72618dc0bd31a7b86d40e0dc46e
parent 3965507116bd60598dccb3ef730a5350af2002c3
parent 5d4c86892885ae1bc12e0e157b35ef44e8ba81bd
author Sreeram Ramachandran <sreeram@google.com> 1404846664 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404846664 +0000

am 5d4c8689: Merge "Define a writeable CONFDIR for iproute2."

* commit '5d4c86892885ae1bc12e0e157b35ef44e8ba81bd':
  Define a writeable CONFDIR for iproute2.