| commit | 776bfd806a1619ac0944d4ea36330c4cde4d665d | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 20 17:54:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 17:54:22 2015 +0000 |
| tree | b6bf5025e4fd0db49effcac6b7cba3cfd441b783 | |
| parent | 0af43510cc45373614cdfce7d014283100e96cb9 [diff] | |
| parent | 8a55bcb640c8842348eb41495fdb8fe82cb0465d [diff] |
am 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-dev * commit '8a55bcb640c8842348eb41495fdb8fe82cb0465d': Sanity check padding/delay values for gapless playback