summaryrefslogtreecommitdiff
path: root/libs/utils/Threads.cpp
diff options
context:
space:
mode:
author Chung-yih Wang <cywang@google.com> 2010-08-05 19:38:04 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-08-05 19:38:04 -0700
commitbce20fffeffcdc486c25836b5fa21134096ff414 (patch)
treefa9980169c3a61a355714df5f4a5f96a26944d62 /libs/utils/Threads.cpp
parent1f0b5d455c89df5605007ebd5790cbbc5eb7f691 (diff)
parent9dcf6cf54153c89bfcc35dd6f470a5fc44311a77 (diff)
am b9605886: Merge "Revert "Revert "Move SIP telephony related codes to framework.""" into gingerbread
Merge commit 'b9605886d1a94de624b6feb5a81bb37f41653437' into gingerbread-plus-aosp * commit 'b9605886d1a94de624b6feb5a81bb37f41653437': Revert "Revert "Move SIP telephony related codes to framework.""
Diffstat (limited to 'libs/utils/Threads.cpp')
0 files changed, 0 insertions, 0 deletions