summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-05-27 14:16:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-27 14:16:52 +0000
commit6940b361e54d083be38c24bfaa4f168462640d03 (patch)
tree15817cc93425f64d681d6af721de693003d92d36 /services
parentbf1bf9dea7fdd0690e242a28a16b151b8d7411e6 (diff)
parent8600534df66c2ff5846ed230b50c56229322d48a (diff)
downloadframeworks_base-6940b361e54d083be38c24bfaa4f168462640d03.zip
frameworks_base-6940b361e54d083be38c24bfaa4f168462640d03.tar.gz
frameworks_base-6940b361e54d083be38c24bfaa4f168462640d03.tar.bz2
Merge "VolumeZen: combine ringer/notification volume and zen." into lmp-preview-dev
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions