commit | 985f527de71573b7ffb610b87e42f04704da3a79 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Jul 14 11:41:04 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 14 11:41:04 2010 -0700 |
tree | 8485855a55d92321f8dbed501f087eaedc8b9e80 | |
parent | 0d9f0c0ea45a0239653e04f2c63ccecb1bc62c6b [diff] | |
parent | 678966d7694d0c69c933bc7ff14886012358c200 [diff] |
am 678966d7: merge from open-source froyo Merge commit '678966d7694d0c69c933bc7ff14886012358c200' * commit '678966d7694d0c69c933bc7ff14886012358c200': Keep also the CAP_NET_RAW capability