| commit | b49b1af06952c310dd715234e30e646db3d525b0 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 20 19:31:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 19:31:03 2015 +0000 |
| tree | 847da345a7fd5e4f59456bf34d3cdfbac52f9bc7 | |
| parent | f8f0e0b756b0f96eccc94af89a0087c146232b26 [diff] | |
| parent | f526f687a686201cae03dfa6d59917b91294e913 [diff] |
am f526f687: am a07ad890: am 776bfd80: am 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-dev * commit 'f526f687a686201cae03dfa6d59917b91294e913': Sanity check padding/delay values for gapless playback