From: Jean-Baptiste Queru Date: Mon, 11 Mar 2013 19:47:28 +0000 (-0700) Subject: am 42b4c508: (-s ours) am 11ff695d: (-s ours) Reconcile with jb-mr1-release - do... X-Git-Tag: android-x86-7.1-r1~209^2~31^2^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=63790dce7a791ef575ea80d69776324e15ecf701;p=android-x86%2Fsystem-netd.git am 42b4c508: (-s ours) am 11ff695d: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '42b4c5083b168c6780b95e5c60b49655b049d56f': --- 63790dce7a791ef575ea80d69776324e15ecf701