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

resolved conflicts for merge of 17c61aaf to master

Browse Source 
Change-Id: I288054a9e6997ec3e8e2906058b83c7d629a239a
This commit is contained in:
Jean-Baptiste Queru
2010-07-23 18:51:47 -07:00
parent 5a48825cc0 17c61aaf46
commit cfb814bd81
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ide/eclipse/.classpath
View File

@@ -49,6 +49,7 @@
<classpathentry kind="src" path="frameworks/base/test-runner/src"/> <classpathentry kind="src" path="frameworks/base/test-runner/src"/>
<classpathentry kind="src" path="frameworks/base/vpn/java"/> <classpathentry kind="src" path="frameworks/base/vpn/java"/>
<classpathentry kind="src" path="frameworks/base/wifi/java"/> <classpathentry kind="src" path="frameworks/base/wifi/java"/>
<classpathentry kind="src" path="frameworks/ex/common/java"/>
<classpathentry kind="src" path="frameworks/opt/vcard/java"/> <classpathentry kind="src" path="frameworks/opt/vcard/java"/>
<classpathentry kind="src" path="development/samples/ApiDemos/src"/> <classpathentry kind="src" path="development/samples/ApiDemos/src"/>
<classpathentry kind="src" path="development/samples/ApiDemos/tests/src"/> <classpathentry kind="src" path="development/samples/ApiDemos/tests/src"/>