From: The Android Open Source Project Date: Mon, 30 Jul 2012 22:16:42 +0000 (-0700) Subject: am 4d5d5107: (-s ours) Reconcile with jb-mr1-release X-Git-Tag: android-x86-4.4-r1~1256 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=53f36d0d530be3419a7b85b83ee8c252ad0ff05a;p=android-x86%2Fpackages-apps-Settings.git am 4d5d5107: (-s ours) Reconcile with jb-mr1-release * commit '4d5d510713ba79b044b0d62434e6067b2fb5fd01': --- 53f36d0d530be3419a7b85b83ee8c252ad0ff05a