diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-14 22:44:23 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-14 22:44:23 -0700 |
| commit | 11abc8a36d639775b05a0471c9ea45d83fa19e56 (patch) | |
| tree | edf234f013ef3c88507f81dea65b8187cc672564 /docs/html/guide/guide_toc.cs | |
| parent | 6ec72e3fa9cdf9e896f3042fb1b1b4f3f6cea541 (diff) | |
| parent | e52a5a5fca18348728dfc5609b42b88e9cc7ef98 (diff) | |
| download | frameworks_base-11abc8a36d639775b05a0471c9ea45d83fa19e56.zip frameworks_base-11abc8a36d639775b05a0471c9ea45d83fa19e56.tar.gz frameworks_base-11abc8a36d639775b05a0471c9ea45d83fa19e56.tar.bz2 | |
Merge commit 'goog/master' into merge_master
Conflicts:
opengl/libagl/Android.mk
opengl/libs/Android.mk
opengl/libs/egl_impl.h
Diffstat (limited to 'docs/html/guide/guide_toc.cs')
| -rw-r--r-- | docs/html/guide/guide_toc.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index 5367cb2..a044cea 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -95,7 +95,7 @@ </ul> </li> --> <!-- <li><a style="color:gray;">Localization</a></li> --> - <li><a href="<?cs var:toroot ?>guide/topics/appwidgets/index.html">AppWidgets</a></li> + <li><a href="<?cs var:toroot ?>guide/topics/appwidgets/index.html">App Widgets</a></li> </ul> </li> @@ -146,7 +146,7 @@ <li class="toggle-list"> <div><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/index.html">UI Guidelines</a></div> <ul> - <li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/widget_design.html">Widget Design</a></li> + <li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/widget_design.html">App Widget Design</a></li> </ul> </li> <li><a href="<?cs var:toroot ?>guide/practices/design/performance.html">Designing for Performance</a></li> |