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