tree a7dcb32bd00be5b642f57235267938e0dbffb0e3
parent a3e0aa5f25908d92535e045bbde73c9a3d19adc7
parent b6be9425299582fb554c6a42f8e110bef794828f
author Payton Turnage <turnage@google.com> 1560194796 -0700
committer Payton Turnage <turnage@google.com> 1560194883 -0700

[third_party/aac] Merge updates from android.

Created by

git checkout -b upstream
git pull https://android.googlesource.com/platform/external/aac
git checkout master
git merge --no-ff upstream

Change-Id: Ib86b0258653f76a5263fa678edf237e77111ca46