summaryrefslogtreecommitdiff
path: root/libs/utils/Tokenizer.cpp
diff options
context:
space:
mode:
author Jean-Baptiste Queru <jbq@google.com> 2010-11-17 16:54:39 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-11-17 16:54:39 -0800
commitb2aed43b5778a1b8b621e05d5da4d35c2f98f046 (patch)
treeed68a85d29dc6c8b8f72b947b778186e6f871579 /libs/utils/Tokenizer.cpp
parent02ef5c8fdddf22eb35bf3819461360253298218a (diff)
parenta7dda98df7ab61b9a7ed93aace480cd5e90f7f10 (diff)
am 7ee42771: Merge "resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp" into gingerbread-plus-aosp
* commit '7ee427714d4621bd9a0b15364a073aff60ebf20c': Added buildQuery and buildUnionSubQuery methods without misleading selectionArgs parameter.
Diffstat (limited to 'libs/utils/Tokenizer.cpp')
0 files changed, 0 insertions, 0 deletions