LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '7a494baf' into manualmerge

Browse Source 
Conflicts:
	ide/eclipse/.classpath

Change-Id: I0bb9abaef2525b38816f7901f13dd7ddb9167f4b
This commit is contained in:
Andy Stadler
2012-09-24 17:47:47 -07:00
parent e51e0d050f 7a494bafc0
commit 28f349bbb0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ide/eclipse/.classpath
View File

@@ -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"/>