Merge the internal timeline into ExoPlayerImplInternal.

Browse source

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=129325922

...

This commit is contained in:

andrewlewis 2016-08-04 06:51:17 -07:00 committed by Oliver Woodman

parent ee565300cb

commit c2c41558e5

1 changed files with 509 additions and 549 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

1058

library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java

View file

File diff suppressed because it is too large Load diff