tree ed68a85d29dc6c8b8f72b947b778186e6f871579
parent 02ef5c8fdddf22eb35bf3819461360253298218a
parent a7dda98df7ab61b9a7ed93aace480cd5e90f7f10
author Jean-Baptiste Queru <jbq@google.com> 1290041679 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1290041679 -0800

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.