| commit | 04c8c5cabe8d7737edab121ec4255be3cec8c97f | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Thu Nov 17 13:20:16 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 17 13:20:16 2011 -0800 |
| tree | 27bbc5d508fc7a2ddaa93dcf8bdc84e0ba691b97 | |
| parent | e74aa129a341a1493e79888ec6cd78d9f32b027b [diff] | |
| parent | 6047cd6408128dd84da0fcdb0d7f9401dbea5601 [diff] |
am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1 * commit '624efe45671131903fb5165f6133ba39486092ab': Make sure not to cancel pending seek/EOS notifications on a cache underrun...