tree ef01248625fb7eeb41b9b1983a7c26e8a9aa6aae
parent 0c511ed637ec8b49db85d52f4030ac5ae5509db0
parent 6163b8c260a5da132ac4c2320e60b9af423bd521
author Jeff Sharkey <jsharkey@android.com> 1257297353 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257297353 -0800

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

Merge commit '6163b8c260a5da132ac4c2320e60b9af423bd521'

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