OSDN Git Service

Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev
authorJohn Spurlock <jspurlock@google.com>
Tue, 28 Oct 2014 17:08:42 +0000 (17:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 28 Oct 2014 17:08:43 +0000 (17:08 +0000)

Trivial merge