OSDN Git Service

am a07ad890: am 776bfd80: am 8a55bcb6: resolved conflicts for merge of ced2dd3c to...
authorMarco Nelissen <marcone@google.com>
Thu, 20 Aug 2015 18:05:12 +0000 (18:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Aug 2015 18:05:12 +0000 (18:05 +0000)
commitf526f687a686201cae03dfa6d59917b91294e913
tree851e233353c1bcf23e6c3242d64408fbc0ca7368
parent562be234743f7d82f8ee45cf0258e9db8239a817
parenta07ad8901acd0b4c1eeab5e0c44b56b692662a92
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