tree bd23b738963d818cc4888383accc36c6e31fc9f6
parent 2928b9e8d83caeda0942333876179b18dcdabb62
parent ceff2b0c0e8ec0a9e28148f47d7d305937ef6bcf
author Rom Lemarchand <romlem@android.com> 1447869204 +0000
committer android-build-merger <android-build-merger@google.com> 1447869204 +0000

resolve merge conflicts of 1366cabc3d to stage-aosp-master. am: 8c64904f61
am: ceff2b0c0e

* commit 'ceff2b0c0e8ec0a9e28148f47d7d305937ef6bcf':
  qcom: audio: Fix missed msm8974 flags