OSDN Git Service

am c80014fb: am 062f736c: Adding zen mode condition dialog
authorJason Monk <jmonk@google.com>
Tue, 16 Sep 2014 15:20:57 +0000 (15:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Sep 2014 15:20:57 +0000 (15:20 +0000)
* commit 'c80014fbbbfbefaab96aeffd9dd585801bd8d0e9':


Trivial merge