OSDN Git Service

am 384ad06e: am a8e0a5b5: Merge "Settings: Add to the zen alarm string." into lmp-dev
authorJohn Spurlock <jspurlock@google.com>
Thu, 24 Jul 2014 23:31:18 +0000 (23:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Jul 2014 23:31:18 +0000 (23:31 +0000)
commit06fbbf6f313c161980f2d28d81b19942a9adb306
treed3cb7727e027ebdac141c316d63398fffa49e2ef
parent40b8f46072ad242fc420d922cffb83b082e84894
parent384ad06ec0357e8e9c7915f66d6795d6f9ba2819
am 384ad06e: am a8e0a5b5: Merge "Settings: Add to the zen alarm string." into lmp-dev

* commit '384ad06ec0357e8e9c7915f66d6795d6f9ba2819':
  Settings: Add to the zen alarm string.