diff options
| author | Elliott Hughes <enh@google.com> | 2016-06-17 03:51:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-17 03:51:19 +0000 |
| commit | 5a4f8316df580b0dbfe1e4b86819f2a6d68d7e10 (patch) | |
| tree | 187dc5ae554eb2afa79d1b59643473ae5dc221cf | |
| parent | 6f25ce204f57a9eec9c514e5fa19ccdf8489cafd (diff) | |
| parent | 2694c6a594fc3165121480b474dee919749e406b (diff) | |
| download | libpng-5a4f8316df580b0dbfe1e4b86819f2a6d68d7e10.tar.gz | |
resolve merge conflicts of 55caa15 to stage-aosp-masterandroid-n-mr1-preview-2android-n-mr1-preview-1
am: 2694c6a594
Change-Id: Ie59976f602e937366c10fbf2ed89fc0676926c90
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index c2e21ca80..1c3602b27 100644 --- a/Android.mk +++ b/Android.mk @@ -37,7 +37,7 @@ my_src_files_intel := \ contrib/intel/intel_init.c \ contrib/intel/filter_sse2_intrinsics.c -common_CFLAGS := -std=gnu89 -Wno-unused-parameter #-fvisibility=hidden ## -fomit-frame-pointer +common_CFLAGS := -std=gnu89 -Wno-unused-parameter # For the host # ===================================================== |