diff options
| author | Andy Stadler <stadler@google.com> | 2012-09-24 17:47:47 -0700 |
|---|---|---|
| committer | Andy Stadler <stadler@google.com> | 2012-09-24 17:47:47 -0700 |
| commit | 28f349bbb0d0fab0877d27dfac7ca2d9d4b6893d (patch) | |
| tree | a2761dec30b15a09a800699d74bcd74183a04eff /ide | |
| parent | e51e0d050fb1a8af7f4a8e790096ae56832306b7 (diff) | |
| parent | 7a494bafc040016fe8f7c90ceaab496b37791ac9 (diff) | |
Merge commit '7a494baf' into manualmerge
Conflicts:
ide/eclipse/.classpath
Change-Id: I0bb9abaef2525b38816f7901f13dd7ddb9167f4b
Diffstat (limited to 'ide')
| -rw-r--r-- | ide/eclipse/.classpath | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ide/eclipse/.classpath b/ide/eclipse/.classpath index c5d40b9fb..9453daca4 100644 --- a/ide/eclipse/.classpath +++ b/ide/eclipse/.classpath @@ -123,7 +123,7 @@ <classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/telephony-common_intermediates/src/src/java"/> <classpathentry kind="src" path="out/target/common/R"/> <classpathentry kind="src" path="external/apache-http/src"/> - <classpathentry kind="src" path="external/bouncycastle/src/main/java"/> + <classpathentry kind="src" path="external/bouncycastle/bcprov/src/main/java"/> <classpathentry kind="src" path="external/guava/guava/src"/> <classpathentry kind="src" path="external/libphonenumber/java/src"/> <classpathentry kind="src" path="external/nist-sip/java"/> |