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