summaryrefslogtreecommitdiff
path: root/libs/utils/StringArray.cpp
diff options
context:
space:
mode:
author Christopher Tate <ctate@google.com> 2010-08-24 18:23:56 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-08-24 18:23:56 -0700
commit71d9781fc680b86830a6d2788e16dbfcfc81ce6d (patch)
tree0314b93c0f69ae613944b5e5ca4df9908f1217ad /libs/utils/StringArray.cpp
parent365d9864878fb3767c2850093ed31fd2346d2e99 (diff)
parent2a7b3ebb99209f20128110d4ec95006046a940fe (diff)
am 2b81d6dd: am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo
Merge commit '2b81d6dd8aa470aff6026c019ca10dbc6d66f7c1' into gingerbread-plus-aosp * commit '2b81d6dd8aa470aff6026c019ca10dbc6d66f7c1': Make the default backup configuration "disabled; local transport selected"
Diffstat (limited to 'libs/utils/StringArray.cpp')
0 files changed, 0 insertions, 0 deletions