tree 132cb45597d365e2e06e3cc0322bcb8a8ab013f5
parent 34a714b0040f102c45523700c6cc1dece27ef01c
parent 2f70edf80ae906a114fdba46cd362708da25d543
author Jeff Brown <jeffbrown@google.com> 1336583481 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336583481 -0700

am 2f70edf8: am 796a85e2: Merge "Revert "Use O_CLOEXEC when opening cgroup fds."" into jb-dev

* commit '2f70edf80ae906a114fdba46cd362708da25d543':
  Revert "Use O_CLOEXEC when opening cgroup fds."