tree a25c2691f25336e4110aa5aaa7a64d552b57f71b
parent 8cac67b6167cece7ed0e479391741b4169dcf2b1
parent ac0f704b1a77cb27dc0975206825098df6b211bb
author Phil Burk <philburk@google.com> 1456790779 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1456790781 +0000

Merge "AudioService: add support for ENCODED_SURROUND_OUTPUT" into nyc-dev