tree 339b0ba2efbf15b29ef18e364b6998f3aa05edca
parent de03facdb2a48021ec2b25e25e28926c35c2acfc
parent 1679274c9cbf49a0998070d42a24207d189bbd93
author Pavlin Radoslavov <pavlin@google.com> 1484878778 +0000
committer android-build-merger <android-build-merger@google.com> 1484878778 +0000

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

Change-Id: I17c2d7f5c558e17fc4b579d879160f4d6a6ce587