diff options
| author | Robert Ly <robertly@google.com> | 2011-07-08 17:53:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-08 17:53:12 -0700 |
| commit | e25bb44c1c8d47b6e15e535bfa59e27a2f77735a (patch) | |
| tree | 59f2351cc6aebfe4fd8514d83a9bc31c0851fcd8 /docs | |
| parent | 6737441c1736607b35f40cdd5b6126f7a0c912dc (diff) | |
| parent | d9f91425fc740bc85a8629a27b68b48acaf85962 (diff) | |
| download | frameworks_base-e25bb44c1c8d47b6e15e535bfa59e27a2f77735a.zip frameworks_base-e25bb44c1c8d47b6e15e535bfa59e27a2f77735a.tar.gz frameworks_base-e25bb44c1c8d47b6e15e535bfa59e27a2f77735a.tar.bz2 | |
am d9f91425: am 6b98e712: am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
* commit 'd9f91425fc740bc85a8629a27b68b48acaf85962':
cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/sdk/eclipse-adt.jd | 2 | ||||
| -rw-r--r-- | docs/html/sdk/tools-notes.jd | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/sdk/eclipse-adt.jd b/docs/html/sdk/eclipse-adt.jd index b4f1b27..18f47a6 100644 --- a/docs/html/sdk/eclipse-adt.jd +++ b/docs/html/sdk/eclipse-adt.jd @@ -99,7 +99,7 @@ padding: .25em 1em; <a href="#" onclick="return toggleDiv(this)"> <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-img" height="9px" width="9px" /> -ADT 12.0.0</a> <em>(June 2011)</em> +ADT 12.0.0</a> <em>(July 2011)</em> <div class="toggleme"> <dl> diff --git a/docs/html/sdk/tools-notes.jd b/docs/html/sdk/tools-notes.jd index d4ebf8a..8c4d037 100644 --- a/docs/html/sdk/tools-notes.jd +++ b/docs/html/sdk/tools-notes.jd @@ -66,7 +66,7 @@ padding: .25em 1em; <div class="toggleable opened"> <a href="#" onclick="return toggleDiv(this)"> <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-img" height="9px" width="9px" /> -SDK Tools, Revision 12</a> <em>(June 2011)</em> +SDK Tools, Revision 12</a> <em>(July 2011)</em> <div class="toggleme"> <dl> <dt>Dependencies:</dt> |