tree dd2a85cdb602722276929c7002e2496e5d6dbc01
parent 14b2e8b50ad25b6929e39296b00ede7b138e2f5d
parent 550b85cb4b3088186b71dbdb7844b4ec72bfc963
author Robert Shih <robertshih@google.com> 1474541342 +0000
committer android-build-merger <android-build-merger@google.com> 1474541342 +0000

Merge "SampleIterator: clear members on seekTo error" into klp-dev am: 610a9222d6 am: a78bd18c93 am: 9578341c41 am: 8ede96a5f2 am: f7a2861c08 am: 2379d9e501 am: ed775f7c81 am: 3c5b347344 am: 2b7d32540a
am: 550b85cb4b

Change-Id: Ic71b31f22763bb76bc185d3658ed66477dae5da4