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