| commit | 62ee3e9ab623a6ac1bb08a0b4db17e749315ac57 | [log] [tgz] |
|---|---|---|
| author | Ricardo Cervera-Navarro <rcervera@google.com> | Fri Apr 18 19:19:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 18 19:19:57 2014 +0000 |
| tree | 139eb3eae1ab5d597ee770a4a64863c961dfad99 | |
| parent | 40d75a6480f75c3475e78569c9bc1b6c51f6ed51 [diff] | |
| parent | 15d1feb0c183b09877317ea64be4e477bfb7fd3d [diff] |
am 15d1feb0: am fed2c410: am 4874938a: am 84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs * commit '15d1feb0c183b09877317ea64be4e477bfb7fd3d': Revert "docs: Watermark images with easter eggs"
diff --git a/docs/html/images/activity_lifecycle.png b/docs/html/images/activity_lifecycle.png index 71ffe9f..879f51f 100644 --- a/docs/html/images/activity_lifecycle.png +++ b/docs/html/images/activity_lifecycle.png Binary files differ
diff --git a/docs/html/images/admin/device-admin-activate-prompt.png b/docs/html/images/admin/device-admin-activate-prompt.png index 1ebe719..3786788 100644 --- a/docs/html/images/admin/device-admin-activate-prompt.png +++ b/docs/html/images/admin/device-admin-activate-prompt.png Binary files differ
diff --git a/docs/html/images/axis_device.png b/docs/html/images/axis_device.png index dd9c23b..f1f666a 100644 --- a/docs/html/images/axis_device.png +++ b/docs/html/images/axis_device.png Binary files differ
diff --git a/docs/html/images/developing/ddms-network.png b/docs/html/images/developing/ddms-network.png index 5bf4ce6..5aa1290 100644 --- a/docs/html/images/developing/ddms-network.png +++ b/docs/html/images/developing/ddms-network.png Binary files differ
diff --git a/docs/html/images/developing/hv_device_window.png b/docs/html/images/developing/hv_device_window.png index d2a1ddc..2bb80a8 100644 --- a/docs/html/images/developing/hv_device_window.png +++ b/docs/html/images/developing/hv_device_window.png Binary files differ
diff --git a/docs/html/images/efficient-downloads/mobile_radio_state_machine.png b/docs/html/images/efficient-downloads/mobile_radio_state_machine.png index 98e9398..e06608b 100644 --- a/docs/html/images/efficient-downloads/mobile_radio_state_machine.png +++ b/docs/html/images/efficient-downloads/mobile_radio_state_machine.png Binary files differ
diff --git a/docs/html/images/fundamentals/fragments.png b/docs/html/images/fundamentals/fragments.png index 8abaeba..cb7204b 100644 --- a/docs/html/images/fundamentals/fragments.png +++ b/docs/html/images/fundamentals/fragments.png Binary files differ
diff --git a/docs/html/images/opengl/ogl-triangle.png b/docs/html/images/opengl/ogl-triangle.png index 6fefe1f..66047ab 100644 --- a/docs/html/images/opengl/ogl-triangle.png +++ b/docs/html/images/opengl/ogl-triangle.png Binary files differ
diff --git a/docs/html/images/publishing/publishing_preparing.png b/docs/html/images/publishing/publishing_preparing.png index 07fcc58..40c0ac6 100644 --- a/docs/html/images/publishing/publishing_preparing.png +++ b/docs/html/images/publishing/publishing_preparing.png Binary files differ
diff --git a/docs/html/images/screens_support/compat-zoom-thumb.png b/docs/html/images/screens_support/compat-zoom-thumb.png index 9d76e20..244800b 100644 --- a/docs/html/images/screens_support/compat-zoom-thumb.png +++ b/docs/html/images/screens_support/compat-zoom-thumb.png Binary files differ
diff --git a/docs/html/images/sdk_manager_packages.png b/docs/html/images/sdk_manager_packages.png index eddd80c..a0e8108 100644 --- a/docs/html/images/sdk_manager_packages.png +++ b/docs/html/images/sdk_manager_packages.png Binary files differ
diff --git a/docs/html/images/tools/as-breakpointswindow.png b/docs/html/images/tools/as-breakpointswindow.png index e5ae19d..a40b459 100644 --- a/docs/html/images/tools/as-breakpointswindow.png +++ b/docs/html/images/tools/as-breakpointswindow.png Binary files differ
diff --git a/docs/html/images/tools/as-buildvariants.png b/docs/html/images/tools/as-buildvariants.png index 8e05a1e..a245163 100644 --- a/docs/html/images/tools/as-buildvariants.png +++ b/docs/html/images/tools/as-buildvariants.png Binary files differ
diff --git a/docs/html/images/tools/as-mainscreen.png b/docs/html/images/tools/as-mainscreen.png index 6f2bc3c..da399d7 100644 --- a/docs/html/images/tools/as-mainscreen.png +++ b/docs/html/images/tools/as-mainscreen.png Binary files differ
diff --git a/docs/html/images/tools/as-theme-db.png b/docs/html/images/tools/as-theme-db.png index a9e34c7..beade0d 100644 --- a/docs/html/images/tools/as-theme-db.png +++ b/docs/html/images/tools/as-theme-db.png Binary files differ
diff --git a/docs/html/images/tools/sdk-manager-support-libs.png b/docs/html/images/tools/sdk-manager-support-libs.png index a44f4bb..3796800 100644 --- a/docs/html/images/tools/sdk-manager-support-libs.png +++ b/docs/html/images/tools/sdk-manager-support-libs.png Binary files differ
diff --git a/docs/html/images/training/app-navigation-multiple-sizes-multipane-good.png b/docs/html/images/training/app-navigation-multiple-sizes-multipane-good.png index 1a8766f..3588318 100644 --- a/docs/html/images/training/app-navigation-multiple-sizes-multipane-good.png +++ b/docs/html/images/training/app-navigation-multiple-sizes-multipane-good.png Binary files differ
diff --git a/docs/html/images/training/basics/intent-chooser.png b/docs/html/images/training/basics/intent-chooser.png index 14b6c45..8a8d33938 100644 --- a/docs/html/images/training/basics/intent-chooser.png +++ b/docs/html/images/training/basics/intent-chooser.png Binary files differ
diff --git a/docs/html/images/training/basics/network-settings1.png b/docs/html/images/training/basics/network-settings1.png index 8395abc..9eaf207d 100644 --- a/docs/html/images/training/basics/network-settings1.png +++ b/docs/html/images/training/basics/network-settings1.png Binary files differ
diff --git a/docs/html/images/training/basics/network-settings2.png b/docs/html/images/training/basics/network-settings2.png index 4e02c09..5f4dc63 100644 --- a/docs/html/images/training/basics/network-settings2.png +++ b/docs/html/images/training/basics/network-settings2.png Binary files differ
diff --git a/docs/html/images/training/firstapp/adt-new-activity.png b/docs/html/images/training/firstapp/adt-new-activity.png index 6d89e4b..2c32dcc 100644 --- a/docs/html/images/training/firstapp/adt-new-activity.png +++ b/docs/html/images/training/firstapp/adt-new-activity.png Binary files differ
diff --git a/docs/html/images/ui/clipboard/copy_paste_framework.png b/docs/html/images/ui/clipboard/copy_paste_framework.png index 9409a5d..57facaa 100644 --- a/docs/html/images/ui/clipboard/copy_paste_framework.png +++ b/docs/html/images/ui/clipboard/copy_paste_framework.png Binary files differ
diff --git a/docs/html/images/ui/dialog_checkboxes.png b/docs/html/images/ui/dialog_checkboxes.png index af84b6a..8f272e5 100644 --- a/docs/html/images/ui/dialog_checkboxes.png +++ b/docs/html/images/ui/dialog_checkboxes.png Binary files differ
diff --git a/docs/html/resources/articles/images/inputmethod_lifecycle_image.png b/docs/html/resources/articles/images/inputmethod_lifecycle_image.png index a975aa7..5f7cf95 100644 --- a/docs/html/resources/articles/images/inputmethod_lifecycle_image.png +++ b/docs/html/resources/articles/images/inputmethod_lifecycle_image.png Binary files differ
diff --git a/docs/html/resources/articles/images/spellcheck_lifecycle.png b/docs/html/resources/articles/images/spellcheck_lifecycle.png index 4349d63..00bd461 100644 --- a/docs/html/resources/articles/images/spellcheck_lifecycle.png +++ b/docs/html/resources/articles/images/spellcheck_lifecycle.png Binary files differ
