summaryrefslogtreecommitdiffstats
path: root/libs/ui
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-10-18 10:31:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-18 10:31:38 -0700
commit8def48bb9b8509a123ca4c0818b573b1a7c87e0b (patch)
tree60e01d1b54244b5da6a07286d5794b6fb7346442 /libs/ui
parent33eafa8ebc800259a914a11c39c9a7c311b5ac2e (diff)
parente6ba89b3caf970aa742d47d4e71495f54cb4a694 (diff)
downloadframeworks_native-8def48bb9b8509a123ca4c0818b573b1a7c87e0b.zip
frameworks_native-8def48bb9b8509a123ca4c0818b573b1a7c87e0b.tar.gz
frameworks_native-8def48bb9b8509a123ca4c0818b573b1a7c87e0b.tar.bz2
am 6ba052b4: (-s ours) am c1a564b1: Merge "Add support for secure system overlays. (DO NOT MERGE)" into gingerbread
Merge commit '6ba052b4847d85831c38c9b8e2942cef4987e55b' * commit '6ba052b4847d85831c38c9b8e2942cef4987e55b': Add support for secure system overlays. (DO NOT MERGE)
Diffstat (limited to 'libs/ui')
0 files changed, 0 insertions, 0 deletions