tree cdbc4b98662f38fb2ab993ed7d9222790d412c45
parent adabe566906aa5e8ce791327559aeb10c139b365
parent f25e55df1b086161ab28653b583c945df0a16615
author JP Abgrall <jpa@google.com> 1313036547 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1313036547 -0700

am f25e55df: Merge changes I8e33c883,I0a2d1615,I401fc0b4,Ie0fb5b59

* commit 'f25e55df1b086161ab28653b583c945df0a16615':
  libcutils: qtaguid: support socket untagging, return errors.
  Move qtaguid.c from common sources in Android.mk to fix windows build.
  Fix header file inclusion for type uid_t.
  Add communication support for xt_qtaguid(network traffic accounting) kernel module.