From d6024345f461f757df3d493c622e68b07199a2c0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 20 Mar 2012 14:14:30 -0700 Subject: merge in jb-release history after reset to master --- jni/rtp/Android.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/jni/rtp/Android.mk b/jni/rtp/Android.mk index d725713..49b711d 100644 --- a/jni/rtp/Android.mk +++ b/jni/rtp/Android.mk @@ -37,7 +37,6 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libutils \ libmedia \ - libmedia_native \ libstagefright_amrnb_common LOCAL_STATIC_LIBRARIES := libgsm libstagefright_amrnbdec libstagefright_amrnbenc -- cgit v1.2.3 From 66c85d703e3e5a68febeba966a6a125d302b7226 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 21 Mar 2012 07:03:25 -0700 Subject: merge in jb-release history after reset to master --- jni/rtp/Android.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/jni/rtp/Android.mk b/jni/rtp/Android.mk index 49b711d..d725713 100644 --- a/jni/rtp/Android.mk +++ b/jni/rtp/Android.mk @@ -37,6 +37,7 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libutils \ libmedia \ + libmedia_native \ libstagefright_amrnb_common LOCAL_STATIC_LIBRARIES := libgsm libstagefright_amrnbdec libstagefright_amrnbenc -- cgit v1.2.3