commit 8fd719529a85a9379dfe0095bf193e76481bb805
author The Android Automerger <android-build@google.com> Wed Jan 27 00:00:42 2016 -0800
committer The Android Automerger <android-build@google.com> Wed Jan 27 00:00:42 2016 -0800
tree fe3758aee9898b1cf1c2280e6afce795a1263824
parent d8170174bf66c98fca967b7133783c0c95292993
parent d82d2e66caad17157f8f0aaf72b9e4a44e4bcdf4

merge in nyc-release history after reset to master

Android.mk

diff --git a/Android.mk b/Android.mk
index f04ce0e..f032a6c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,7 +22,6 @@
     src/bind.cpp \
     src/chrono.cpp \
     src/condition_variable.cpp \
-    src/config_elast.h \
     src/debug.cpp \
     src/exception.cpp \
     src/future.cpp \
@@ -40,7 +39,6 @@
     src/stdexcept.cpp \
     src/string.cpp \
     src/strstream.cpp \
-    src/support \
     src/system_error.cpp \
     src/thread.cpp \
     src/typeinfo.cpp \