From: Pavel Zhamaitsiak <pavelz@google.com>
Date: Tue, 10 Mar 2015 19:34:18 +0000 (+0000)
Subject: Merge "Show alerts in case of some IMS registration errors." into lmp-mr1-wfc-dev
X-Git-Tag: android-x86-6.0-r1~860^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=736d29b87c495881bb50d4e3682aa82f5fcd708f;p=android-x86%2Fpackages-apps-Settings.git

Merge "Show alerts in case of some IMS registration errors." into lmp-mr1-wfc-dev
automerge: 4c7a410

* commit '4c7a4101ca87668341a998d17e929f66973c53f5':
  Show alerts in case of some IMS registration errors.
---

736d29b87c495881bb50d4e3682aa82f5fcd708f