summaryrefslogtreecommitdiff
path: root/libs/utils/String16.cpp
diff options
context:
space:
mode:
author Scott Main <smain@google.com> 2010-11-10 15:10:13 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-11-10 15:10:13 -0800
commit5d9a8d6ecb20fb097a0b95146a6082d3d2874c62 (patch)
treee55bf98762860cb205e142a53d1afa80b378148b /libs/utils/String16.cpp
parent7e358cb73c5e3a58f342b36222a9fd89e417807b (diff)
parentbbea7710b77974ea35b423f4db692dfe98731143 (diff)
am d4b5d85e: (-s ours) am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbread
* commit 'd4b5d85e2cbf8fb7150a0b0030132e28d7e4d9e2': docs: remove "new" tags from sample apps
Diffstat (limited to 'libs/utils/String16.cpp')
0 files changed, 0 insertions, 0 deletions