| commit | bcd8ae6ed44a4acbffd8a09122394401476ea851 | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Thu Aug 20 19:47:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 19:47:03 2015 +0000 |
| tree | e3d63a68e93666dbe7c948d24941e715e3367490 | |
| parent | de6b1a52889223a25e48b5119fd191d0ed58ecdc [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