| commit | ee6e479d12ee68d10102042e46f9599757e37e63 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Wed Jan 27 00:00:43 2016 -0800 |
| committer | The Android Automerger <android-build@google.com> | Wed Jan 27 00:00:43 2016 -0800 |
| tree | 4670f66eb3105527bde736f5167d3bb8de4b7581 | |
| parent | fb11cb31ea214386a681d2f28b126b310ac53657 [diff] | |
| parent | a234598fea116033a26752349cab4bf9fa5fc13a [diff] |
merge in nyc-release history after reset to master
diff --git a/Android.mk b/Android.mk index cb63f11..281bcc8 100644 --- a/Android.mk +++ b/Android.mk
@@ -32,7 +32,6 @@ src/cxa_vector.cpp \ src/cxa_virtual.cpp \ src/exception.cpp \ - src/fallback_malloc.ipp \ src/private_typeinfo.cpp \ src/stdexcept.cpp \ src/typeinfo.cpp \