diff options
| author | Elliott Hughes <enh@google.com> | 2014-09-08 13:08:43 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-09-08 13:08:43 -0700 |
| commit | 4656e69bf36d42a35c9290ab79eeb33b4cca1d5c (patch) | |
| tree | 84c6fe3c5e58781c54ce34961d9152d370919dae /docs/html/guide/appendix | |
| parent | 8268ad6779c38fb67ea3783fd57bf71bb0cccc51 (diff) | |
| parent | 2008cff73bbc816f867dac0cd057899bed714356 (diff) | |
resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp
Change-Id: I5148eda624e8504f12dbc1288cd4a7a5b7c10850
Diffstat (limited to 'docs/html/guide/appendix')
| -rw-r--r-- | docs/html/guide/appendix/glossary.jd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/guide/appendix/glossary.jd b/docs/html/guide/appendix/glossary.jd index af60eb728eb2..db518f931879 100644 --- a/docs/html/guide/appendix/glossary.jd +++ b/docs/html/guide/appendix/glossary.jd @@ -94,7 +94,7 @@ excludeFromSuggestions=true Plugin, DDMS is integrated into your development environment. See <a href="{@docRoot}tools/debugging/ddms.html">Using DDMS</a> to learn more about the program.</dd> - <dt id="dialog">Dialog</dt> <dd> A floating window that that acts as a lightweight + <dt id="dialog">Dialog</dt> <dd> A floating window that acts as a lightweight form. A dialog can have button controls only and is intended to perform a simple action (such as button choice) and perhaps return a value. A dialog is not intended to persist in the history stack, contain complex layout, |