From: John Spurlock <jspurlock@google.com>
Date: Wed, 29 Apr 2015 14:16:12 +0000 (+0000)
Subject: am 0423aed7: Merge "Settings: "No interruptions" -> "Total silence"" into mnc-dev
X-Git-Tag: android-x86-7.1-r1~1317^2~669
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1e8a9f5fd33a1f3e27921cf2a555c6bb199a9ffe;p=android-x86%2Fpackages-apps-Settings.git

am 0423aed7: Merge "Settings: "No interruptions" -> "Total silence"" into mnc-dev

* commit '0423aed775d0b00cbdf6cc1b422ede704830d43a':
  Settings: "No interruptions" -> "Total silence"
---

1e8a9f5fd33a1f3e27921cf2a555c6bb199a9ffe