OSDN Git Service

Merge "Settings: Add to the zen alarm string." into lmp-dev
authorJohn Spurlock <jspurlock@google.com>
Thu, 24 Jul 2014 15:26:16 +0000 (15:26 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 23 Jul 2014 18:31:55 +0000 (18:31 +0000)
commita8e0a5b5f9a1d9fbade91909d57eb431fed69a86
tree2f0cd934d49c58604d97863142ba9930fe5925d1
parente68f5224e4359aef7f62c94130d5b9b221bee389
parent1b821ffad4cb000a1a201b61b89014d95191b686
Merge "Settings: Add to the zen alarm string." into lmp-dev
res/values/strings.xml