| commit | 67914e234125ee70383dffafac20de0fbe21fd04 | [log] [tgz] |
|---|---|---|
| author | Rom Lemarchand <romlem@android.com> | Mon Jan 11 18:57:30 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jan 11 18:57:30 2016 +0000 |
| tree | c99e7cc70c6d6e1588f3d03db84f29cd4bc127c2 | |
| parent | befe610a877c3b150a6dd90cf358df4945b8f9a6 [diff] | |
| parent | ceff2b0c0e8ec0a9e28148f47d7d305937ef6bcf [diff] |
resolve merge conflicts of 1366cabc3d to stage-aosp-master. am: 8c64904f61 am: ceff2b0c0e * commit 'ceff2b0c0e8ec0a9e28148f47d7d305937ef6bcf': qcom: audio: Fix missed msm8974 flags