| commit | ceff2b0c0e8ec0a9e28148f47d7d305937ef6bcf | [log] [tgz] |
|---|---|---|
| author | Rom Lemarchand <romlem@android.com> | Tue Nov 17 12:22:48 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 17 12:22:48 2015 +0000 |
| tree | 17e27b279286e06d00cc65d5bc2340c017ca1dfe | |
| parent | b14d76b8cb245d3db231e46873cd767736727619 [diff] | |
| parent | 8c64904f61caf03ebb916873c7d03d8a3aca7bfd [diff] |
resolve merge conflicts of 1366cabc3d to stage-aosp-master. am: 8c64904f61 * commit '8c64904f61caf03ebb916873c7d03d8a3aca7bfd': qcom: audio: Fix missed msm8974 flags