summaryrefslogtreecommitdiff
path: root/libs/utils/StringArray.cpp
diff options
context:
space:
mode:
author Brian Carlstrom <bdc@google.com> 2010-09-15 11:37:22 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-15 11:37:22 -0700
commit6bd6d21962d443396747931ae842aece3dbef90f (patch)
tree1e7afed8ff0231c6b168062fa8f04396d6eb7f2f /libs/utils/StringArray.cpp
parent7ea18cf23edd89c42ec67d7659cea4470b4285fe (diff)
parentfe9f855c4ef2c73632944f71481d8f27586b261f (diff)
am e68f8b7e: am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
Merge commit 'e68f8b7ebe898ec06d7a156964d498e3d0a2e6c0' * commit 'e68f8b7ebe898ec06d7a156964d498e3d0a2e6c0': Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
Diffstat (limited to 'libs/utils/StringArray.cpp')
0 files changed, 0 insertions, 0 deletions