From: Sanket Padawe <sanketpadawe@google.com>
Date: Fri, 10 Oct 2014 05:15:52 +0000 (+0000)
Subject: am ce1bfbb0: resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp
X-Git-Tag: android-x86-6.0-r1~1402
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ea2e53ead56bc3bce765581f06a1c9e043a5e46c;p=android-x86%2Fpackages-apps-Settings.git

am ce1bfbb0: resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp

* commit 'ce1bfbb04e75a9b4362b2f3070ff4ee5406f136d':
  Removing display number format from SIM UI
---

ea2e53ead56bc3bce765581f06a1c9e043a5e46c