OSDN Git Service

am 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-dev
authorMarco Nelissen <marcone@google.com>
Thu, 20 Aug 2015 17:54:22 +0000 (17:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Aug 2015 17:54:22 +0000 (17:54 +0000)
commit776bfd806a1619ac0944d4ea36330c4cde4d665d
treeb6bf5025e4fd0db49effcac6b7cba3cfd441b783
parent0af43510cc45373614cdfce7d014283100e96cb9
parent8a55bcb640c8842348eb41495fdb8fe82cb0465d
am 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-dev

* commit '8a55bcb640c8842348eb41495fdb8fe82cb0465d':
  Sanity check padding/delay values for gapless playback