tree eccb9cfcd63ff6d3b7086761a8c2937ce92395a3
parent b707ce7837d471a79c100348db0af75e21a42513
parent af9aa07fbdcabf873efe7c27862e7825dbdfdb88
author Phil Burk <philburk@google.com> 1455316392 +0000
committer android-build-merger <android-build-merger@google.com> 1455316392 +0000

Merge "AudioFormat: implement ENCODING_IEC61937" into nyc-dev
am: af9aa07fbd

* commit 'af9aa07fbdcabf873efe7c27862e7825dbdfdb88':
  AudioFormat: implement ENCODING_IEC61937