From: The Android Open Source Project <initial-contribution@android.com>
Date: Wed, 15 Aug 2012 15:32:39 +0000 (-0700)
Subject: am d2c65351: (-s ours) Reconcile with jb-mr1-release - do not merge
X-Git-Tag: android-x86-7.1-r1~407
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2788887b2363be0f12b43ab2c6fa8c31906876d3;p=android-x86%2Fsystem-netd.git

am d2c65351: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'd2c653514cd77fc8ce73c4da40ac9e2a9d4a74f5':
---

2788887b2363be0f12b43ab2c6fa8c31906876d3