From: Jean-Baptiste Queru Date: Mon, 11 Mar 2013 20:00:37 +0000 (-0700) Subject: am 58ac2762: am a03f07f0: (-s ours) am d2e43dce: (-s ours) Reconcile with jb-mr1... X-Git-Tag: cm-10.2-M1^2~17^2^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=71dc25d1929a80c636008d0e491bfa282d69bec0;p=GitHub%2FLineageOS%2Fandroid_hardware_samsung_slsi_exynos5.git am 58ac2762: am a03f07f0: (-s ours) am d2e43dce: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '58ac276242d6fd28324bb9c0f09aff64765c4d8e': --- 71dc25d1929a80c636008d0e491bfa282d69bec0