tree d9ddad29cc3de0e5552087fa6a52e35bad9674b3
parent 3ec8ba8d3486a3b2c37cdc32fe12d095d84ff11a
parent 2e7db9627875c107e692725b014784502e8b23a3
author Adrian Roos <roosa@google.com> 1399463318 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399463318 +0000

am 2e7db962: Merge "Dump open files if we run out of file descriptors" into ub-now-nova

* commit '2e7db9627875c107e692725b014784502e8b23a3':
  Dump open files if we run out of file descriptors