| commit | 3da06b82ee4bc6e6779128e0527decb396bda1bb | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 20 20:10:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 20:10:34 2015 +0000 |
| tree | 1b7733a7b77c5ff45c03f18e3b0eaaf0d009a769 | |
| parent | e8e71d5f079503bd40f4b920b3b45b3853560f40 [diff] | |
| parent | 1b1152f7451ef3849e79f17b4cbe91f916788e50 [diff] |
am 1b1152f7: am 2946707b: am b49b1af0: am f526f687: am a07ad890: am 776bfd80: am 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-dev * commit '1b1152f7451ef3849e79f17b4cbe91f916788e50': Sanity check padding/delay values for gapless playback