tree a84f032ffc32e6f85502e2c2d62658793c104e42
parent 37d85ea1f71bf0bfdea15dd5bfa8785ece1a15d2
parent 967c1f29abc321c34306424534c8b57a033b18dc
author Ian Rogers <irogers@google.com> 1458154536 +0000
committer android-build-merger <android-build-merger@google.com> 1458154536 +0000

Merge "Fix assignment of H264TrackImpl.timescale."
am: 967c1f2

* commit '967c1f29abc321c34306424534c8b57a033b18dc':
  Fix assignment of H264TrackImpl.timescale.