| commit | ba20a08670dfb3bb0ab58b0e1e48fe1178c7cfcb | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Wed Aug 19 01:42:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 19 01:42:46 2015 +0000 |
| tree | 86972791c54bc87fe26cab132734a24971c8f0c8 | |
| parent | d188405205be7658c24909b8610bee285bcab6aa [diff] | |
| parent | bc167f832db091e490b552a147ec73412241e1e5 [diff] |
am bc167f83: resolved conflicts for merge of 84fb58bd to lmp-mr1-dev * commit 'bc167f832db091e490b552a147ec73412241e1e5': DO NOT MERGE - audio flinger: fix fuzz test crash