tree 9f39e50a4ef6e18494b97843b678dffd60ae7d50
parent f99f320dc79e290a89d668243b6d77c3442b36ab
parent 4f0f120316cfcee5880191264885772677fff921
author John Spurlock <jspurlock@google.com> 1407279149 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1407198913 +0000

Merge "AudioService: getMasterStreamType -> RING on tablets." into lmp-dev