Commits
Marco Nelissen authored and Android Git Automerger committed d99e62c5a0cM
am 7f8040a8: am 0acbed25: am 6104fb28: Merge "Use stream type if set by user" into lmp-mr1-dev * commit '7f8040a80472b86c358f4b28ca7ec938d7fbed00': Use stream type if set by user
Showing diff to2a3f6a7b113