Merge remote-tracking branch 'origin/master' into master-next

swift-ci · swift-ci · commit 3e793a071d6c · 2019-07-09T19:10:03.000-07:00
diff --git a/stdlib/public/SwiftShims/LibcShims.h b/stdlib/public/SwiftShims/LibcShims.h
@@ -23,6 +23,10 @@
 #include "SwiftStddef.h"
 #include "Visibility.h"
 
+#if defined(__ANDROID__)
+#include <android/api-level.h>
+#endif
+
 #if __has_feature(nullability)
 #pragma clang assume_nonnull begin
 #endif
