Merge the internal timeline into ExoPlayerImplInternal.

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

Merge the internal timeline into ExoPlayerImplInternal.
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=129325922
c2c41558 · andrewlewis · Oliver Woodman · ee565300 · c2c41558
Commit c2c41558 authored Aug 04, 2016 by andrewlewis Committed by Oliver Woodman Aug 08, 2016
Showing with 0 additions and 0 deletions
library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
--- a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java