diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-10-03 16:31:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-03 16:31:18 +0000 |
| commit | 504f701d475bdefbd6a27f00933975bc501e072d (patch) | |
| tree | e3b8cc0511294a1441067da79f13d1f145a36593 /services/audioflinger/Tracks.cpp | |
| parent | 36a7f5b2971f9125e908388113d5e52ddcb8822c (diff) | |
| parent | 2cf3340ddeb5d406909710ac8b74ff59d3451586 (diff) | |
| download | frameworks_av-504f701d475bdefbd6a27f00933975bc501e072d.zip frameworks_av-504f701d475bdefbd6a27f00933975bc501e072d.tar.gz frameworks_av-504f701d475bdefbd6a27f00933975bc501e072d.tar.bz2 | |
am 2cf3340d: resolved conflicts for merge of c51e512a to lmp-mr1-dev-plus-aosp
* commit '2cf3340ddeb5d406909710ac8b74ff59d3451586':
Fix struct vs. class mismatches
Diffstat (limited to 'services/audioflinger/Tracks.cpp')
0 files changed, 0 insertions, 0 deletions