diff options
| author | Marco Nelissen <marcone@google.com> | 2015-08-20 19:38:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 19:38:48 +0000 |
| commit | 2946707b893e558784f3fefe2e8552df15701cd4 (patch) | |
| tree | a4fa0e984cdcd3e512d5501e2e7eb08becf54c58 /media | |
| parent | ddb63b46279a1bb3698cebb6c744013fc3bb17e2 (diff) | |
| parent | b49b1af06952c310dd715234e30e646db3d525b0 (diff) | |
| download | frameworks_av-2946707b893e558784f3fefe2e8552df15701cd4.zip frameworks_av-2946707b893e558784f3fefe2e8552df15701cd4.tar.gz frameworks_av-2946707b893e558784f3fefe2e8552df15701cd4.tar.bz2 | |
am b49b1af0: am f526f687: am a07ad890: am 776bfd80: am 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-dev
* commit 'b49b1af06952c310dd715234e30e646db3d525b0':
Sanity check padding/delay values for gapless playback
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions