| commit | 60047ae30cc816e98ddb4b0b48e58c34c3d1f486 | [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 | 6bbd2fd26a30192dd319f1a1ea93cb7ecdd545ed | |
| parent | 1de4e2e1d7c22a31238e448200cbbe667cd5fa4c [diff] | |
| parent | 7f2bec1f9b8acc105a5779b18ab180dbe59a1b00 [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...