| commit | d6024345f461f757df3d493c622e68b07199a2c0 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Tue Mar 20 14:14:30 2012 -0700 |
| committer | The Android Automerger <android-build@android.com> | Tue Mar 20 14:14:30 2012 -0700 |
| tree | 429091e0e4965e7b1e3779c00dee353cb9e08d16 | |
| parent | 49952644906debfafa1b830a2c532103e7afbcbc [diff] |
merge in jb-release history after reset to master
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 @@ libcutils \ libutils \ libmedia \ - libmedia_native \ libstagefright_amrnb_common LOCAL_STATIC_LIBRARIES := libgsm libstagefright_amrnbdec libstagefright_amrnbenc