summaryrefslogtreecommitdiff
path: root/libs/utils/FileMap.cpp
diff options
context:
space:
mode:
author Andreas Huber <andih@google.com> 2011-11-17 09:07:36 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-11-17 09:07:36 -0800
commit6047cd6408128dd84da0fcdb0d7f9401dbea5601 (patch)
tree6612a4783a0af5dacf89a520c8ea80420dc0103b /libs/utils/FileMap.cpp
parent9f735eae2b493569ed5ddc894c87cf4e1979a829 (diff)
parent7cf8bf90c4a8307708aaae32535514381485ab78 (diff)
am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1
* commit 'c1b1709b2faa985fb9c2b273ca2191b5bfba5fdd': Make sure not to cancel pending seek/EOS notifications on a cache underrun...
Diffstat (limited to 'libs/utils/FileMap.cpp')
0 files changed, 0 insertions, 0 deletions