tree 3d056824c3f180c92906ef0bde27c9fe40687c4d
parent a0ef8e5ba532433cd432a6361fd400c128c4201c
parent d034c90cf585e0924c912bd2a8d2ea60716aa466
author Phil Burk <philburk@google.com> 1456790779 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1456790780 +0000

Merge "audio_policy.h: Force use for ENCODED_SURROUND_OUTPUT" into nyc-dev