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

Merge "resolved conflicts for merge of ac8d7926 to honeycomb-plus-aosp" into honeycomb-plus-aosp

Browse Source
This commit is contained in:
Scott Main
2011-01-11 14:53:52 -08:00
committed by Android (Google) Code Review
parent a94aeb3175 7024a313e4
commit e15c4e4d63
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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