tree e7e131a3771df7094b5582ea31489202d790426b
parent 4d177111aaecdc1e547e994be3db23bc6e257668
parent a840b0f2879df4a8ab0b4d622e9927c935eca860
author Lajos Molnar <lajos@google.com> 1457021485 +0000
committer android-build-merger <android-build-merger@google.com> 1457021485 +0000

Merge "media: correctly return cached size for MediaDataSource" into nyc-dev am: 64389e25ba
am: a840b0f287

* commit 'a840b0f2879df4a8ab0b4d622e9927c935eca860':
  media: correctly return cached size for MediaDataSource