OSDN Git Service

Merge "Zen: "Muted by <x>" indicator string." into lmp-dev
authorJohn Spurlock <jspurlock@google.com>
Fri, 22 Aug 2014 16:06:05 +0000 (16:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 22 Aug 2014 16:06:06 +0000 (16:06 +0000)

Trivial merge