| commit | a1846819a88197a5e0ceab85df103cd753d685e3 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:25:22 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:25:22 2010 -0800 |
| tree | 9f19f3657dfd2caae243c1eab470aefd3aac6ed5 | |
| parent | c4e357f36260ba7d7dc279b43dd94453238943d1 [diff] | |
| parent | 2d3353be64c34a8ed7c0c75a739e48b517c361e6 [diff] |
am 2d3353be: am 04f4c51c: reconcile main tree with open-source eclair Merge commit '2d3353be64c34a8ed7c0c75a739e48b517c361e6' * commit '2d3353be64c34a8ed7c0c75a739e48b517c361e6': android-2.1_r1 snapshot
diff --git a/Android.mk b/Android.mk index 290a027..145259d 100644 --- a/Android.mk +++ b/Android.mk
@@ -34,4 +34,4 @@ LOCAL_MODULE:= libjpeg -include $(BUILD_STATIC_LIBRARY) +include $(BUILD_SHARED_LIBRARY)