tree 98faf5b1aa7c8987c23e77a855cfbbeb1f354891
parent cac76070ee7311d8aa1f931f75fc0d4881a56d68
parent 4706f6af73e485e4fbcb5ff76509fbd517223ad9
author Mikhail Naganov <mnaganov@google.com> 1520572435 +0000
committer android-build-merger <android-build-merger@google.com> 1520572435 +0000

Merge "Add AUDIO_FORMAT_AAC_XHE to type converter" into pi-dev
am: 4706f6af73

Change-Id: I586efe7359d03211dd98652e293cbbf624649ec6