| commit | f088f9345e0cf16c4e002b56a931165c54e9c1e6 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Sun Feb 07 00:01:19 2016 -0800 |
| committer | The Android Automerger <android-build@google.com> | Sun Feb 07 00:01:19 2016 -0800 |
| tree | 6aa6959e570e9f9a0044a2357198896864e8fb1f | |
| parent | 9aaf7749f6ff1eeddb527cc7b40010c2a8e4dc11 [diff] | |
| parent | ec8a1c990114451cce92958ec292346015917ee6 [diff] |
merge in nyc-release history after reset to master
diff --git a/Android.mk b/Android.mk index 3f8ebba..2904098 100644 --- a/Android.mk +++ b/Android.mk
@@ -565,7 +565,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libchrome_test ifdef BRILLO - LOCAL_MODULE_TAGS := debug + LOCAL_MODULE_TAGS := eng endif LOCAL_SRC_FILES := $(libchromeCryptoUnittestSrc) $(libchromeCommonUnittestSrc) LOCAL_CPP_EXTENSION := $(libchromeCommonCppExtension)