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

Merge commit 'e897c1b4' into manualmerge

Browse Source 
Conflicts:
	samples/ApiDemos/src/com/example/android/apis/app/_index.html
This commit is contained in:
Dirk Dougherty
2009-12-15 23:27:22 -08:00
parent 7a41627710 e897c1b428
commit a276296490
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/ApiDemos/src/com/example/android/apis/app/_index.html
View File

@@ -7,7 +7,7 @@
<dt>Code:
<dd> <a href="HelloWorld.html">HelloWorld.java</a>
<dt>Layout:
<dd> <a href="/guide/samples/ApiDemos/res/layout/hello_world.html">
<dd> <a href="../../../../../../res/layout/hello_world.html">
hello_world.xml</a>
</dl>
</dd>
@@ -99,7 +99,7 @@
<dd> <a href="OneShotAlarm.html">OneShotAlarm.java</a>
<dd> <a href="RepeatingAlarm.html">RepeatingAlarm.java</a>
<dt>Layout:
<dd> <a href="/guide/samples/ApiDemos/res/layout/alarm_controller.html">
<dd> <a href="../../../../../../res/layout/alarm_controller.html">
alarm_controller.xml</a>
</dl>
</dd>
@@ -113,7 +113,7 @@
<dd> <a href="AlarmService.html">AlarmService.java</a>
<dd> <a href="AlarmService_Service.html">AlarmService_Service.java</a>
<dt>Layout:
<dd> <a href="/guide/samples/ApiDemos/res/layout/alarm_service.html">
<dd> <a href="../../../../../../res/layout/alarm_service.html">
alarm_service.xml</a>
</dl>
</dd>