tree c15e62bc6fe5a76efd3a214764ca49b3597084b7
parent a642e27372bc9a4d7438037a46e31f96a7d8e87a
parent e2d20aa1ab5de52ee4a4f5ba3cffcc1166a0b44f
author Jeff Sharkey <jsharkey@android.com> 1257297034 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257297034 -0800

am e2d20aa1: resolved conflicts for merge of bf6a7e4d to eclair-mr2

Merge commit 'e2d20aa1ab5de52ee4a4f5ba3cffcc1166a0b44f' into eclair-mr2-plus-aosp

* commit 'e2d20aa1ab5de52ee4a4f5ba3cffcc1166a0b44f':
  Expose IS_RESTRICTED field through queryEntities() views.