resolved conflicts for merge of f8cc65c4 to honeycomb-plus-aosp

Change-Id: I407df4448a126a39128f3e24232c166be2625e14

docs/html/guide/developing/building/index.jd

@@ -37,7 +37,7 @@ page.title=Building and Running Apps
   
   <p>The following diagram depicts the components involved in building and running an application:</p>
 
-  <img src="/images/build-simplified.png" />
+  <img src="{@docRoot}images/build-simplified.png" />
 
   <h2 id="detailed-build">A Detailed Look at the Build Process</h2>
 
@@ -49,7 +49,7 @@ page.title=Building and Running Apps
   tools and processes are masked from you. The following diagram depicts the different tools and
   processes that are involved in a build:</p>
 
-  <p><img src="/images/build.png" /></p>
+  <p><img src="{@docRoot}images/build.png" /></p>
 
   <p>The general process for a typical build is outlined below:</p>
 

docs/html/guide/developing/debugging/debugging-tracing.jd

@@ -67,7 +67,7 @@ page.title=Profiling with Traceview and dmtracedump
   selected method. The method in this case is <code>LoadListener.nativeFinished()</code> and it was selected in
   the profile view.</p>
 
-  <img src="/images/traceview_timeline.png"
+  <img src="{@docRoot}images/traceview_timeline.png"
        alt="Traceview timeline panel"
        width="893"
        height="284" />
@@ -87,7 +87,7 @@ page.title=Profiling with Traceview and dmtracedump
   <code>LoadListener.nativeFinished();</code> looking at the timeline panel shows that one of those calls took
   an unusually long time.</p>
 
-  <img src="/images/traceview_profile.png"
+  <img src="{@docRoot}images/traceview_profile.png"
        alt="Traceview profile panel."
        width="892"
        height="630" />

docs/html/guide/developing/debugging/index.jd

@@ -62,7 +62,7 @@ page.title=Debugging
 
   <p>Figure 1 shows how the various debugging tools work together in a typical
   debugging environment.</p>
-  <img src="/images/debugging.png"
+  <img src="{@docRoot}images/debugging.png"
         alt="Debugging workflow" />
   <p class="img-caption><strong>Figure 1. </strong> Debugging Workflow</p>
 

docs/html/guide/developing/devices/emulator.jd

@@ -33,7 +33,7 @@ page.title=Using the Android Emulator
 </div>
 </div>
 
-<img src="/images/emulator-wvga800l.png" alt="Image of the Android Emulator"
+<img src="{@docRoot}images/emulator-wvga800l.png" alt="Image of the Android Emulator"
 width="367" height="349" style="margin-left:2em;float:right;"/>
 <p>The Android SDK includes a virtual mobile device emulator
 that runs on your computer. The emulator lets you prototype, develop, and test

docs/html/guide/developing/projects/index.jd

@@ -471,7 +471,7 @@ in figure 1, with two linked folders (in this example, <code>MyLibrary</code> an
 <code>MyLibrary/src</code>. Eclipse shows an error on one of them because they
 are duplicate links to a single class.</p> 
  
-<img src="/images/developing/lib-migration-0.png" alt=""> 
+<img src="{@docRoot}images/developing/lib-migration-0.png" alt=""> 
 <p class="img-caption"><strong>Figure 1.</strong> Library project migration error</p>
 <p>To fix the error, remove the linked folder that <em>does not</em> contain the
 <code>_src</code> suffix. </p> 
@@ -481,14 +481,14 @@ are duplicate links to a single class.</p>
 <code>MyLibrary</code> folder) and choose <strong>Build Path</strong> &gt;
 <strong>Remove from Build Path</strong>, as shown in figure 2.</li> 
  
-<img src="/images/developing/lib-migration-1.png" style="height:600px"
+<img src="{@docRoot}images/developing/lib-migration-1.png" style="height:600px"
 alt=""> 
 <p class="img-caption"><strong>Figure 2.</strong> Remove from Build Path menu item</p>
  
 <li>Next, when asked about unlinking the folder from the project, select
 <strong>Yes</strong>, as shown in figure 3.</li> 
  
-<img src="/images/developing/lib-migration-2.png" alt=""> 
+<img src="{@docRoot}images/developing/lib-migration-2.png" alt=""> 
 
 <p class="img-caption"><strong>Figure 3.</strong> Unlink folder confirmation window</p>
 </ol> 

docs/html/guide/guide_toc.cs

@@ -466,38 +466,37 @@
           <li><a href="<?cs var:toroot ?>guide/developing/tools/logcat.html">logcat</a></li>
           <li><a href="<?cs var:toroot ?>guide/developing/tools/mksdcard.html">mksdcard</a></li>
 
-          <li><a href="/guide/developing/tools/monkey.html">Monkey</a></li>
+          <li><a href="<?cs var:toroot ?>guide/developing/tools/monkey.html">Monkey</a></li>
               <li class="toggle-list">
                  <div>
-                     <a href="/guide/developing/tools/monkeyrunner_concepts.html">
+                     <a href="<?cs var:toroot ?>guide/developing/tools/monkeyrunner_concepts.html">
                      <span class="en">monkeyrunner</span>
                   </a>
                   </div>
                   <ul>
                       <li>
-                          <a href="/guide/developing/tools/MonkeyDevice.html">
+                          <a href="<?cs var:toroot ?>guide/developing/tools/MonkeyDevice.html">
                                 <span class="en">MonkeyDevice</span>
                         </a>
                     </li>
                     <li>
-                        <a href="/guide/developing/tools/MonkeyImage.html">
+                        <a href="<?cs var:toroot ?>guide/developing/tools/MonkeyImage.html">
                             <span class="en">MonkeyImage</span>
                         </a>
                     </li>
                     <li>
-                        <a href="/guide/developing/tools/MonkeyRunner.html">
+                        <a href="<?cs var:toroot ?>guide/developing/tools/MonkeyRunner.html">
                             <span class="en">MonkeyRunner</span>
                         </a>
                     </li>
                   </ul>
               </li>
-              <li><a href="<?cs var:toroot ?>guide/developing/tools/proguard.html">ProGuard</a>
+              <li><a href="<?cs var:toroot ?>guide/developing/tools/proguard.html">ProGuard</a></li>
-<span class="new">new!</span></li>
               <li><a href="<?cs var:toroot ?>guide/developing/tools/adb.html#sqlite">sqlite3</a></li>
-              <li><a href="<?cs var:toroot ?>guide/developing/tools/traceview.html" >Traceview</a></li>
+              <li><a href="<?cs var:toroot ?>guide/developing/tools/traceview.html">Traceview</a></li>
-              <li><a href="<?cs var:toroot ?>guide/developing/tools/zipalign.html" >zipalign</a></li>
+          <li><a href="<?cs var:toroot ?>guide/developing/tools/zipalign.html">zipalign</a></li>
-          </ul>
+        </ul>
-        </li>
+      </li>
     </ul>
   </li>