tree 8485855a55d92321f8dbed501f087eaedc8b9e80
parent 0d9f0c0ea45a0239653e04f2c63ccecb1bc62c6b
parent 678966d7694d0c69c933bc7ff14886012358c200
author The Android Open Source Project <initial-contribution@android.com> 1279132864 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279132864 -0700

am 678966d7: merge from open-source froyo

Merge commit '678966d7694d0c69c933bc7ff14886012358c200'

* commit '678966d7694d0c69c933bc7ff14886012358c200':
  Keep also the CAP_NET_RAW capability