| commit | 51ee28d24c0d3000124bd435657dbaf68c65a049 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 12 18:06:09 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 12 18:06:09 2013 -0700 |
| tree | 79f19f80ebb7978e9bab16e1d9b835849c735592 | |
| parent | 9f80dd223d83d9bb9077fb6baee056cee4eaf7e5 [diff] | |
| parent | a1d73d9be0beafd10642d6db0136b16353a32096 [diff] |
am a1d73d9b: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'a1d73d9be0beafd10642d6db0136b16353a32096': audioflinger: fix effects on direct output threads