tree 760735b496e4bbe6a41199c91721456581b5cb70
parent 889731b62d694bf8bc7a6fd28a6b97b8755ec902
parent 4910e5a3520d92c4e6d37bfabc833771e7f02243
author Pavlin Radoslavov <pavlin@google.com> 1484879709 +0000
committer android-build-merger <android-build-merger@google.com> 1484879709 +0000

Merge "Change build config of aac from Android.mk to Android.bp" am: 8334e4b410 am: 2eba55c5a8 am: 1679274c9c
am: 4910e5a352

Change-Id: I06e73ca6768323110b658548a189a1f69695cc08