tree 4b67f9744a2f152f86bb7ca127bb1ab984b11d25
parent 066d3f9b3bd77df71542b132adda8eb25bc013c0
parent 8f98c4b5f011db8637ce1b9361e82d59b13434f4
author Nick Kralevich <nnk@google.com> 1351014415 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351014415 -0700

am 8f98c4b5: Merge "Fix dirfd crash issue in property service"

* commit '8f98c4b5f011db8637ce1b9361e82d59b13434f4':
  Fix dirfd crash issue in property service