commit | df38f5e20948b7dfe75f07346ba2961e25a1c32c | [log] [tgz] |
---|---|---|
author | Christopher Wiley <wiley@google.com> | Tue Apr 19 22:37:47 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Apr 19 22:37:47 2016 +0000 |
tree | 599a8798f42a5041719e514a03f338014af70f2e | |
parent | e05688a176c27025d59c0a512501a411b56f1bb1 [diff] | |
parent | 090003a8d19899abe3cb3126a89b9f5a97b52f57 [diff] |
Merge "Don\'t include android-base/macros.h from android-base/unique_fd.h" am: 090003a * commit '090003a8d19899abe3cb3126a89b9f5a97b52f57': Don't include android-base/macros.h from android-base/unique_fd.h Change-Id: Ibad9225be050ff04077889a7b83cdf232112fb37