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

resolved conflicts for merge of 17bfc712 to master-nova-dev

Browse Source 
Change-Id: I26fb365b5c937bd1758e951eceac2eef5c0323de
This commit is contained in:
Santos Cordon
2014-01-15 15:24:55 -08:00
parent 70939ca364 17bfc71291
commit 5c67ce0ba1
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ide/eclipse/.classpath
View File

@@ -67,7 +67,12 @@
<classpathentry kind="src" path="frameworks/base/packages/SystemUI/src"/> <classpathentry kind="src" path="frameworks/base/packages/SystemUI/src"/>
<classpathentry kind="src" path="frameworks/base/policy/src"/> <classpathentry kind="src" path="frameworks/base/policy/src"/>
<classpathentry kind="src" path="frameworks/base/sax/java"/> <classpathentry kind="src" path="frameworks/base/sax/java"/>
<classpathentry kind="src" path="frameworks/base/services/java"/> <classpathentry kind="src" path="frameworks/base/services/core/java"/>
<classpathentry kind="src" path="frameworks/base/services/accessibility/java"/>
<classpathentry kind="src" path="frameworks/base/services/print/java"/>
<classpathentry kind="src" path="frameworks/base/services/backup/java"/>
<classpathentry kind="src" path="frameworks/base/services/devicepolicy/java"/>
<classpathentry kind="src" path="frameworks/base/services/appwidget/java"/>
<classpathentry kind="src" path="frameworks/base/telecomm/java"/> <classpathentry kind="src" path="frameworks/base/telecomm/java"/>
<classpathentry kind="src" path="frameworks/base/telephony/java"/> <classpathentry kind="src" path="frameworks/base/telephony/java"/>
<classpathentry kind="src" path="frameworks/base/test-runner/src"/> <classpathentry kind="src" path="frameworks/base/test-runner/src"/>