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