summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cervera <rcervera@google.com>2014-04-18 19:20:04 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-18 19:20:04 +0000
commit95b7eaadf3e7570049378b29e533966a5e0cb0d2 (patch)
tree1a74ccf67e756dc518a4e538dadf0077e42c4a89
parent62ee3e9ab623a6ac1bb08a0b4db17e749315ac57 (diff)
parent235fd3c9effc63643db356a593e7f77f220a5f4c (diff)
downloadframeworks_base-95b7eaadf3e7570049378b29e533966a5e0cb0d2.zip
frameworks_base-95b7eaadf3e7570049378b29e533966a5e0cb0d2.tar.gz
frameworks_base-95b7eaadf3e7570049378b29e533966a5e0cb0d2.tar.bz2
am 235fd3c9: am d5ed804f: am a7b62718: am 974588d1: Merge "docs: Watermarked images for codes that weren\'t found." into klp-docs
* commit '235fd3c9effc63643db356a593e7f77f220a5f4c': docs: Watermarked images for codes that weren't found.
-rw-r--r--docs/html/design/media/dialogs_examples.pngbin39873 -> 44959 bytes
-rw-r--r--docs/html/design/media/navigation_drawer_titles_icons.pngbin15000 -> 20467 bytes
-rw-r--r--docs/html/design/media/selection_adjusting_actions.pngbin190458 -> 197541 bytes
-rw-r--r--docs/html/design/media/touch_feedback_communication.pngbin199575 -> 203895 bytes
-rw-r--r--docs/html/design/media/ui_overview_notifications.pngbin42875 -> 49688 bytes
5 files changed, 0 insertions, 0 deletions
diff --git a/docs/html/design/media/dialogs_examples.png b/docs/html/design/media/dialogs_examples.png
index c136476..6ffcee2 100644
--- a/docs/html/design/media/dialogs_examples.png
+++ b/docs/html/design/media/dialogs_examples.png
Binary files differ
diff --git a/docs/html/design/media/navigation_drawer_titles_icons.png b/docs/html/design/media/navigation_drawer_titles_icons.png
index 7cf1e0c..902a72d 100644
--- a/docs/html/design/media/navigation_drawer_titles_icons.png
+++ b/docs/html/design/media/navigation_drawer_titles_icons.png
Binary files differ
diff --git a/docs/html/design/media/selection_adjusting_actions.png b/docs/html/design/media/selection_adjusting_actions.png
index 0799b6b..32a7fec 100644
--- a/docs/html/design/media/selection_adjusting_actions.png
+++ b/docs/html/design/media/selection_adjusting_actions.png
Binary files differ
diff --git a/docs/html/design/media/touch_feedback_communication.png b/docs/html/design/media/touch_feedback_communication.png
index f8162d0..1d4a9dc 100644
--- a/docs/html/design/media/touch_feedback_communication.png
+++ b/docs/html/design/media/touch_feedback_communication.png
Binary files differ
diff --git a/docs/html/design/media/ui_overview_notifications.png b/docs/html/design/media/ui_overview_notifications.png
index 6043412..7975657 100644
--- a/docs/html/design/media/ui_overview_notifications.png
+++ b/docs/html/design/media/ui_overview_notifications.png
Binary files differ