From: Sanket Padawe Date: Fri, 10 Oct 2014 03:19:59 +0000 (-0700) Subject: resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp X-Git-Tag: android-x86-6.0-r1~671^2~442 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ce1bfbb04e75a9b4362b2f3070ff4ee5406f136d;p=android-x86%2Fpackages-apps-Settings.git resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp Change-Id: I3246a5d50f0fa2e324b7c6119a365f8ee9ed2e80 --- ce1bfbb04e75a9b4362b2f3070ff4ee5406f136d