am 1d151678: Merge change Ie8650e4b into eclair

Merge commit '1d15167865b22730cf6ba314a057e62f960aa1db' into eclair-plus-aosp

* commit '1d15167865b22730cf6ba314a057e62f960aa1db':
  sdk doc change for esr: fix some broken links to resources files.

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

@@ -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>
@@ -82,7 +82,7 @@
   <dd> <a href="ServiceStartArgumentsController.html">ServiceStartArgumentsController.java</a>
   <dd> <a href="ServiceStartArguments.html">ServiceStartArguments.java</a>
   <dt>Layout:
-  <dd> <a href="/guide/samples/ApiDemos/res/layout/service_start_arguments_controller.html">
+  <dd> <a href="../../../../../../res/layout/service_start_arguments_controller.html">
   service_start_arguments_controller.xml</a>
   </dl>
   </dd>
@@ -110,7 +110,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>
@@ -124,7 +124,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>