tree f40a797cc845bd0dac03cb235d1e222ad02a565f
parent 95eb4e7637f8241961f89119440f78209257f6f8
parent 3c5b347344ba4471c783aee4edec28d6f1b39b48
author Robert Shih <robertshih@google.com> 1474532008 +0000
committer android-build-merger <android-build-merger@google.com> 1474532008 +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

Change-Id: I8d0b07823c34cfbe2812cffd80cf665998dab5db