summaryrefslogtreecommitdiff
path: root/libs/hwui/ResourceCache.cpp
diff options
context:
space:
mode:
author Christopher Tate <ctate@google.com> 2012-06-14 19:37:45 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2012-06-14 19:37:45 -0700
commit0d732fe68c6c68e93b6ca33d75e92b55ef95a97a (patch)
tree57064fe98e456d669ca99a590b51b95014f4e191 /libs/hwui/ResourceCache.cpp
parent13b5c194e1ca2ed5ca9187e15ca0518b8bb052d2 (diff)
parent0e44a6beeae8a17e81145b83f2dfb8f719d41f52 (diff)
am 0e44a6be: Merge "Don\'t finish noHistory="true" activities behind the lock screen" into jb-dev
* commit '0e44a6beeae8a17e81145b83f2dfb8f719d41f52': Don't finish noHistory="true" activities behind the lock screen
Diffstat (limited to 'libs/hwui/ResourceCache.cpp')
0 files changed, 0 insertions, 0 deletions