tree 1f696af38efda262aedd2ec9499edcbdbb3afc82
parent b494e0b92cad76e6ce2c47177a4d5b00497049bf
parent f7c19622a3d333d38e24cd89e29b9cf1a07c5568
author George Burgess IV <gbiv@google.com> 1501662118 +0000
committer android-build-merger <android-build-merger@google.com> 1501662118 +0000

Merge "libc fortify: make fcntl.h use diagnose_if" am: 5ac5a7c083 am: 96eb6cbf9a
am: f7c19622a3

Change-Id: Ia69ecce286e6e8a16fd60c8f3b1f2a8a5ce5dce5