tree 50e7e44d6d1221288329a0cdc70bf5abb92acdcd
parent 5f442dc01c1a4c279ff8e363ef3ddc336a6bf27d
parent 9428814b8e57e0562235776927c0d3ed99f73f2c
author Christopher Wiley <wiley@google.com> 1461105899 +0000
committer android-build-merger <android-build-merger@google.com> 1461105899 +0000

Merge "Don\'t include android-base/macros.h from android-base/unique_fd.h" am: 090003a am: df38f5e
am: 9428814

* commit '9428814b8e57e0562235776927c0d3ed99f73f2c':
  Don't include android-base/macros.h from android-base/unique_fd.h

Change-Id: I54c1a14226dab156e9aa40b83f6186b36fc3e459