OSDN Git Service

am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev
authorJohn Spurlock <jspurlock@google.com>
Thu, 4 Jun 2015 15:51:05 +0000 (15:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Jun 2015 15:51:05 +0000 (15:51 +0000)
commitafa64f45ab40457af9a2a70f9aa795e65167693d
treed35d1439e8140dcf5db951603cc4264422d1ea7e
parent06840b31f65e4972c24b7716b29831904d9ee694
parent1a1181edde0d8d941161e941f12e6783f25ae43d
am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev

* commit '1a1181edde0d8d941161e941f12e6783f25ae43d':
  Settings: Add zen rule name warning text.