summaryrefslogtreecommitdiff
path: root/libs/utils/StringArray.cpp
diff options
context:
space:
mode:
author Hung-ying Tyan <tyanh@google.com> 2010-09-07 19:40:40 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-07 19:40:40 -0700
commitb4dab551916c45e30854e3520dbaa3fcf0ad13f7 (patch)
tree716ef087ac59b90cff170eb97f989198a904a5a9 /libs/utils/StringArray.cpp
parentc41ba2bd56e5e5def4dd52ade2d800b46a1633b0 (diff)
parent3386566558a41bcf0d3c82166f5302e8aca492cb (diff)
am d580eee2: Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread
Merge commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b' into gingerbread-plus-aosp * commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b': SipPhone: switch to its own phone type PHONE_TYPE_SIP.
Diffstat (limited to 'libs/utils/StringArray.cpp')
0 files changed, 0 insertions, 0 deletions