From: John Spurlock <jspurlock@google.com>
Date: Thu, 4 Jun 2015 16:04:13 +0000 (+0000)
Subject: am afa64f45: am 1a1181ed: Merge "Settings: Add zen rule name warning text." into... 
X-Git-Tag: android-x86-7.1-r1~1235^2~640
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dec8f8107c13a0a6f0ff4e8d65139eb139a20850;p=android-x86%2Fpackages-apps-Settings.git

am afa64f45: am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev

* commit 'afa64f45ab40457af9a2a70f9aa795e65167693d':
  Settings: Add zen rule name warning text.
---

dec8f8107c13a0a6f0ff4e8d65139eb139a20850