tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent 1cd7dc43e162e72e63f8e154ac2e03ad238bd062
parent dffdd5eb6d366b2f35ec87f20f91207e3b4657c3
author Tao Bao <tbao@google.com> 1440684836 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440684836 +0000

am dffdd5eb: am 06e6ccb9: (-s ours) am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs."

* commit 'dffdd5eb6d366b2f35ec87f20f91207e3b4657c3':