summaryrefslogtreecommitdiff
path: root/libs/hwui/Program.cpp
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@google.com> 2010-06-24 16:02:03 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-06-24 16:02:03 -0700
commit14694eb9aea11543524a5f081b932ba984d0b530 (patch)
treedafd07975ead0b5876b7e2ba85e0e51687708947 /libs/hwui/Program.cpp
parentcb2555ebb6bb4c8946ed90f2acd3c21d9c32fd45 (diff)
parent5827d3eaf3c53d1dc3ab0d638d935c219a5515a6 (diff)
am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo
Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into froyo-plus-aosp * commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6': Properly note the current active restore set's token
Diffstat (limited to 'libs/hwui/Program.cpp')
0 files changed, 0 insertions, 0 deletions