From: Jean-Baptiste Queru <jbq@google.com>
Date: Mon, 11 Mar 2013 20:44:36 +0000 (-0700)
Subject: am 565af383: am 33adccd2: am 9cff5e3f: am f4b1aefb: (-s ours) am 8638eeb4: (-s ours... 
X-Git-Tag: android-x86-4.4-r1~95^2~235
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=49e633241c872a31559d934bf25d51c9beb65ea0;p=android-x86%2Fpackages-apps-Settings.git

am 565af383: am 33adccd2: am 9cff5e3f: am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '565af3834c8c4c353fd9bbdffcf2b7817b55f09b':
---

49e633241c872a31559d934bf25d51c9beb65ea0