From: The Android Automerger <android-build@google.com>
Date: Mon, 28 Apr 2014 12:49:59 +0000 (-0700)
Subject: merge in master-release history after reset to 4c2b869a3a30b257acce46d470e92e835a9eb82c
X-Git-Tag: android-x86-7.1-r1~252^2~4^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=97a32f83b1abdcfe371b81bfbbb2a049a9bc4d94;p=android-x86%2Fsystem-netd.git

merge in master-release history after reset to 4c2b869a3a30b257acce46d470e92e835a9eb82c
---

97a32f83b1abdcfe371b81bfbbb2a049a9bc4d94