tree 4a7981c1110086e93792a0bb9450abf133783745
parent 7ef2c93f4cf684c0ce54c7fc3f6b8fc206982b4c
parent 8ed4b1320199ee13db3e8468b47e5054eb7d76bb
author Dan Willemsen <dwillemsen@google.com> 1464393061 +0000
committer android-build-merger <android-build-merger@google.com> 1464393061 +0000

Merge "Fix makefile issues with cts_audio_quality" am: a3f1340ef2
am: 8ed4b13201

* commit '8ed4b1320199ee13db3e8468b47e5054eb7d76bb':
  Fix makefile issues with cts_audio_quality

Change-Id: Ibc589134d811660f9267f047448b524a5849b8a5