summaryrefslogtreecommitdiffstats
path: root/services/voiceinteraction/java
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-09-09 20:40:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-09 20:40:03 +0000
commit9ed0292a650eb52becc0c17e4001767065d325ca (patch)
treecfb8803fb03f184946579822f50a13bd35f65970 /services/voiceinteraction/java
parentda6e6c888f81d3bd19ff1f3cf9b081b7f9b2a013 (diff)
parent806dbae9e12f3875cf0def3da2f3c3c2b768a844 (diff)
downloadframeworks_base-9ed0292a650eb52becc0c17e4001767065d325ca.zip
frameworks_base-9ed0292a650eb52becc0c17e4001767065d325ca.tar.gz
frameworks_base-9ed0292a650eb52becc0c17e4001767065d325ca.tar.bz2
Merge "Zen: Map transition to ringer-mode silent to "priority"." into lmp-dev
Diffstat (limited to 'services/voiceinteraction/java')
0 files changed, 0 insertions, 0 deletions