summaryrefslogtreecommitdiff
path: root/libs/hwui/Program.cpp
diff options
context:
space:
mode:
author John Wang <johnwang@google.com> 2010-08-05 12:08:14 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-08-05 12:08:14 -0700
commit90fe08257f791a7c94e14b9720b976b0c78be0e8 (patch)
tree801bf4a5732dff3059139e05925b0927375e0e84 /libs/hwui/Program.cpp
parentab847c44d0549a47717f16ead806b03eecc957db (diff)
parentefd938f77a315b977031f10e526609e6c7cd7e14 (diff)
am efd938f7: (-s ours) am 62f066a1: Merge "Add register methods in CallManager "do not merge"" into gingerbread
Merge commit 'efd938f77a315b977031f10e526609e6c7cd7e14' * commit 'efd938f77a315b977031f10e526609e6c7cd7e14': Add register methods in CallManager "do not merge"
Diffstat (limited to 'libs/hwui/Program.cpp')
0 files changed, 0 insertions, 0 deletions