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