summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Roman Nurik <romannurik@google.com> 2012-01-12 12:46:50 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-01-12 12:46:50 -0800
commit0786bc734e55b40a16d1a475f311c5460ff55d36 (patch)
treee1b2513a4d12f8a446d7ec3c6e9c69c4c017545a
parent1aff11be4585d6ddff784d7e74188963050805fa (diff)
parentbaa88ef7d3b4d3b16f97a3c56a3049dcb686baf9 (diff)
am baa88ef7: Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
* commit 'baa88ef7d3b4d3b16f97a3c56a3049dcb686baf9': docs: minor Design Principles fixes for Android Design
-rw-r--r--docs/html/design/get-started/principles.html2
-rw-r--r--docs/html/design/static/content/principles_decide_for_me.pngbin115537 -> 113676 bytes
-rw-r--r--docs/html/design/static/content/principles_make_it_mine.pngbin108801 -> 103064 bytes
3 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/design/get-started/principles.html b/docs/html/design/get-started/principles.html
index ab1fe5c17983..0d9ef2031cd4 100644
--- a/docs/html/design/get-started/principles.html
+++ b/docs/html/design/get-started/principles.html
@@ -148,7 +148,7 @@ needed to perform a task while making it more emotionally satisfying.</p>
<h4>Let me make it mine</h4>
<p>People love to add personal touches because it helps them feel at home and in control. Provide
-sensible, beautiful defaults, but also consider fun, optional customizations that don’t hinder
+sensible, beautiful defaults, but also consider fun, optional customizations that don't hinder
primary tasks.</p>
</div>
diff --git a/docs/html/design/static/content/principles_decide_for_me.png b/docs/html/design/static/content/principles_decide_for_me.png
index 9f4159f0d58c..2d8b883b6c02 100644
--- a/docs/html/design/static/content/principles_decide_for_me.png
+++ b/docs/html/design/static/content/principles_decide_for_me.png
Binary files differ
diff --git a/docs/html/design/static/content/principles_make_it_mine.png b/docs/html/design/static/content/principles_make_it_mine.png
index 63802775ba91..683a0b7df81c 100644
--- a/docs/html/design/static/content/principles_make_it_mine.png
+++ b/docs/html/design/static/content/principles_make_it_mine.png
Binary files differ