diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-07-12 17:29:16 -0700 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2010-07-12 17:30:05 -0700 |
| commit | 5a93032dcbe54223e03102d497d7e04370491737 (patch) | |
| tree | 1f6c06f249defe57c0262dabe88d0f393ffcb2fc /docs/html/sdk/android-2.1.jd | |
| parent | b10080106909fd860ed33ac46de9f2f084e358d6 (diff) | |
| parent | 3c691a8d7f1ff39e274352569d19654ebf6160e7 (diff) | |
| download | frameworks_base-5a93032dcbe54223e03102d497d7e04370491737.zip frameworks_base-5a93032dcbe54223e03102d497d7e04370491737.tar.gz frameworks_base-5a93032dcbe54223e03102d497d7e04370491737.tar.bz2 | |
doc change: resolved conflicts for merge of 3c691a8d to gingerbread
Conflicts:
docs/html/sdk/android-2.2.jd
Change-Id: I58f9503db8692df15dba1277a46e4c6eb338b438
Diffstat (limited to 'docs/html/sdk/android-2.1.jd')
| -rw-r--r-- | docs/html/sdk/android-2.1.jd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/sdk/android-2.1.jd b/docs/html/sdk/android-2.1.jd index 7490bae..cd48a72 100644 --- a/docs/html/sdk/android-2.1.jd +++ b/docs/html/sdk/android-2.1.jd @@ -139,7 +139,7 @@ function toggleDiv(link) { <div class="toggleable closed"> <a href="#" onclick="return toggleDiv(this)"> - <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-img" height="9px" width="9px" /> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-img" height="9px" width="9px" /> Android 2.1, Revision 1</a> <em>(January 2010)</em></a> <div class="toggleme"> <dl> |