diff options
| author | The Android Automerger <android-build@android.com> | 2012-03-20 14:14:30 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2012-03-20 14:14:30 -0700 |
| commit | d6024345f461f757df3d493c622e68b07199a2c0 (patch) | |
| tree | 429091e0e4965e7b1e3779c00dee353cb9e08d16 | |
| parent | 49952644906debfafa1b830a2c532103e7afbcbc (diff) | |
| download | android_frameworks_opt_net_voip-d6024345f461f757df3d493c622e68b07199a2c0.tar.gz android_frameworks_opt_net_voip-d6024345f461f757df3d493c622e68b07199a2c0.tar.bz2 android_frameworks_opt_net_voip-d6024345f461f757df3d493c622e68b07199a2c0.zip | |
merge in jb-release history after reset to master
| -rw-r--r-- | jni/rtp/Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
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 |