diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-06-12 07:58:42 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-06-12 07:58:42 -0700 |
| commit | 401a65b7846fb87991142d9caa4a6176f75bbe27 (patch) | |
| tree | 90f376f8c3ddddd393f7076c7d3a719fa995811c /ide | |
| parent | 98a05b894e6f2981816a87ea0dbd6a3092d5c507 (diff) | |
| parent | 45cb1b0a85458dd80fb321c7fa0502e3bd33eaa5 (diff) | |
| download | android_development-401a65b7846fb87991142d9caa4a6176f75bbe27.tar.gz android_development-401a65b7846fb87991142d9caa4a6176f75bbe27.tar.bz2 android_development-401a65b7846fb87991142d9caa4a6176f75bbe27.zip | |
resolved conflicts for merge of 45cb1b0a to jb-dev-plus-aosp
Change-Id: I50fb4331347a1921a5a75eb91a216c7e0499e2d6
Diffstat (limited to 'ide')
| -rw-r--r-- | ide/eclipse/.classpath | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ide/eclipse/.classpath b/ide/eclipse/.classpath index 2e5068473..4a5ba3a90 100644 --- a/ide/eclipse/.classpath +++ b/ide/eclipse/.classpath @@ -94,6 +94,7 @@ <classpathentry kind="src" path="out/target/common/obj/APPS/QuickSearchBox_intermediates/src/src"/> <classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/android-common-carousel_intermediates/src/renderscript/src"/> <classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/com.android.emailcommon_intermediates/src/src"/> + <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/filterfw_intermediates/classes-jarjar.jar"/> <classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java"/> <classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/keystore/java"/> <classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/location/java"/> @@ -112,8 +113,8 @@ <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/bouncycastle_intermediates/classes-jarjar.jar"/> <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/android-support-v4_intermediates/javalib.jar"/> <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/core-junit_intermediates/classes.jar"/> - <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/google-common_intermediates/javalib.jar"/> - <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/gsf-client_intermediates/javalib.jar"/> + <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/android-support-v13_intermediates/javalib.jar"/> + <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/android-common_intermediates/javalib.jar"/> <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/guava_intermediates/javalib.jar"/> <classpathentry kind="lib" path="packages/apps/Calculator/arity-2.1.2.jar"/> <classpathentry kind="output" path="out/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/classes"/> |