am 816e934a: Greatly simplify query

Merge commit '816e934a43bf705835bdb24503a85a14c4861991' into eclair-plus-aosp

* commit '816e934a43bf705835bdb24503a85a14c4861991':
  Greatly simplify query
tree: 95c500606ae92121460adfcb46b0519878eaf7ee
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE