| commit | e06c47e24ab069ad0d3ceb9b9cdb673dba432e35 | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Thu Aug 20 19:46:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 19:46:45 2015 +0000 |
| tree | b86fe41f486653f344d8e316407eb6f7e85cf479 | |
| parent | a48f431f7dd172e6cb5b6a8426098a5b1c485b4e [diff] | |
| parent | d3f4c3989512211827c1fd062d4cfa64009b8fc9 [diff] |
am d3f4c398: am 899ad39b: am ba20a086: am bc167f83: resolved conflicts for merge of 84fb58bd to lmp-mr1-dev * commit 'd3f4c3989512211827c1fd062d4cfa64009b8fc9': DO NOT MERGE - audio flinger: fix fuzz test crash