summaryrefslogtreecommitdiff
path: root/libs/utils/FileMap.cpp
diff options
context:
space:
mode:
author Daniel Sandler <dsandler@android.com> 2011-11-18 14:47:58 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-11-18 14:47:58 -0800
commit1ab29ba0ef08b7dbaa088f01faac057016b7370a (patch)
treea20020751e6a69c9d7eefe38f9bcfea79f83ad99 /libs/utils/FileMap.cpp
parent25894023333524467986477c8767e9217c232eee (diff)
parent019837205edc48f97e7485665c6070be7519a0c6 (diff)
am 2e56995e: am da0e7b0c: Merge "Tie screen saver to the screen off timeout." into ics-mr1
* commit '2e56995e9e19f18958167a28911120f31b096756': Tie screen saver to the screen off timeout.
Diffstat (limited to 'libs/utils/FileMap.cpp')
0 files changed, 0 insertions, 0 deletions