tree 339b0ba2efbf15b29ef18e364b6998f3aa05edca
parent bfba552d9eb18b59d27dd414a5a68dbdc113c7d8
parent 2eba55c5a86ccd74a25e7df88d30c9a9c87cc396
author Pavlin Radoslavov <pavlin@google.com> 1484878266 +0000
committer android-build-merger <android-build-merger@google.com> 1484878266 +0000

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

Change-Id: I16c8e041daad6f21dd80ec50db52ae488f1b91c5