tree a63c6ebf14bf155e667299dfa70861d870e9351d
parent 660ae209f170f4709cecd93f0dc5574bb9ec9db3
parent 765c492f0d488ccb97046d1e99e67890b0196b83
author Mikhail Naganov <mnaganov@google.com> 1520576885 +0000
committer android-build-merger <android-build-merger@google.com> 1520576885 +0000

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

Change-Id: I945f0b93cc54e3a79521da5886bbc0f974d7098e