Merge commit 'e897c1b4' into manualmerge

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

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

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

@@ -16,7 +16,7 @@
   <dt>Code:
   <dd><a href="GLSurfaceViewActivity.html">GLSurfaceViewActivity.java</a>
   <dt>Layout:
-  <dd><a href="/guide/samples/ApiDemos/res/layout/hello_world.html">hello_world.xml</a>
+  <dd><a href="../../../../../../res/layout/hello_world.html">hello_world.xml</a>
   </dl>
   </dd>
 
@@ -33,10 +33,9 @@
   <dd>Shows how you can place overlays on top of a SurfaceView.
   <dl>
   <dt>Code:
-  <dd> <a href="SurfaceViewOverlay.html">SurfaceViewOverlay.java</a>,
+  <dd> <a href="SurfaceViewOverlay.html">SurfaceViewOverlay.java</a>
-    <a href="GLSurfaceView.html">GLSurfaceView.java</a>
   <dt>Layout:
-  <dd><a href="/guide/samples/ApiDemos/res/layout/surface_view_overlay.html">surface_view_overlay.xml</a>
+  <dd><a href="../../../../../../res/layout/surface_view_overlay.html">surface_view_overlay.xml</a>
   </dl>
   </dd>