Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I873904e7724c3822d6011b507649c9d2d9e9bfef
This commit is contained in:
Scott Main
2011-01-11 14:51:21 -08:00
parent 9008121c97 ac8d79266b
commit 7024a313e4
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
docs/html/guide/guide_toc.cs
View File

@@ -488,12 +488,13 @@
</li>
</ul>
</li>
<li><a href="/guide/developing/tools/proguard.html">ProGuard</a></li>
<li><a href="/guide/developing/tools/adb.html#sqlite">sqlite3</a></li>
<li><a href="/guide/developing/tools/traceview.html">Traceview</a></li>
<li><a href="<?cs var:toroot ?>guide/developing/tools/zipalign.html">zipalign</a></li>
</ul>
</li>
<li><a href="<?cs var:toroot ?>guide/developing/tools/proguard.html">ProGuard</a>
<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/zipalign.html" >zipalign</a></li>
</ul>
</li>
</ul>
</li>