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