commit | aa25761114b143ed3182d97004ec1366c2ae850e | [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 | 60f713214ef7835ae2815115e017d83b50c2b001 | |
parent | a93a7d6d15295e36b54b928bc57f0b5ca239714a [diff] | |
parent | 624efe45671131903fb5165f6133ba39486092ab [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...