commit 16a7d56f8b9f2b53d94e69722da382819b4ee4c5
author The Android Automerger <android-build@google.com> Mon Apr 11 23:00:20 2016
committer The Android Automerger <android-build@google.com> Mon Apr 11 23:00:20 2016
tree 177f77f5d275bfcdeefa180c2c2c8cb2a2935012
parent 5b009a8d3658b1e2374f2b2a730d42d50b2db898
parent 77086890e40e98b9abb78e4ca184866f55b358da

merge in nyc-release history after reset to nyc-dev

Android.mk

diff --git a/Android.mk b/Android.mk
index 06fae2f..89ccd2c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -304,6 +304,8 @@
 
 LOCAL_MODULE := libprotobuf-cpp-lite_static
 
+LOCAL_MODULE_HOST_OS := darwin linux windows
+
 LOCAL_CPP_EXTENSION := .cc
 
 LOCAL_SRC_FILES := $(CC_LITE_SRC_FILES)
@@ -324,6 +326,8 @@
 
 LOCAL_MODULE := libprotobuf-cpp-lite
 
+LOCAL_MODULE_HOST_OS := darwin linux windows
+
 LOCAL_WHOLE_STATIC_LIBRARIES := libprotobuf-cpp-lite_static
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src