Merge commit '882bbe1489518cabb661e06f6e87a6561d9239df'
* commit '882bbe1489518cabb661e06f6e87a6561d9239df':
AI 150594: change the homepage markup and styles to allow variable height in
AI 150537: Add support for language-specific tabs in android developer's blog. Pass the current language pref as an hl=lang url query.
AI 150536: Change the formatting of sdk redirect pages so that they are not language-specific.
AI 150535: add the Videos page to the site
Merge commit 'da0696187b6927270a6b8a15785aaa328c3030bd'
* commit 'da0696187b6927270a6b8a15785aaa328c3030bd':
AI 150470: CTS: Fix naming for extra permission tests and include them in makefile
AI 150428: update the jquery library to version 1.3.2.
AI 150398: fix the sdk build break
AI 150393: edit the reference's navtree highlighting logic to handle intl/ directories
AI 150389: Fix handling of cookie writes for intl pages.
AI 150370: Add localized content infrastructure in droiddoc templates, javascript, and css. DocFile.java - instead of FileReader, use InputStreamReader with UTF-8 encoding. ClearPage.java - add UTF-8 output encoding to FileOutputStreamWriter. Note: this change also up-integrates gerrit 2146 (smain).
Merge commit '1aa2380c95a107842972f87ce1dfd7be9f859882'
* commit '1aa2380c95a107842972f87ce1dfd7be9f859882':
AI 150428: update the jquery library to version 1.3.2.
Merge commit '233bc0b84aef261a67a364ff3a8e91077fd70fd6'
* commit '233bc0b84aef261a67a364ff3a8e91077fd70fd6':
AI 150370: Add localized content infrastructure in droiddoc templates, javascript, and css. DocFile.java - instead of FileReader, use InputStreamReader with UTF-8 encoding. ClearPage.java - add UTF-8 output encoding to FileOutputStreamWriter. Note: this change also up-integrates gerrit 2146 (smain).
Merge commit '9e202af99c02b2dc45114b566ea20799e77c73fb'
* commit '9e202af99c02b2dc45114b566ea20799e77c73fb':
AI 150131: Remove English/Chinese IME from OpenWnn.
Merge commit 'eaf299f8b465d7db2f37f068b33ace9a5d6d1589'
* commit 'eaf299f8b465d7db2f37f068b33ace9a5d6d1589':
AI 150083: Minor updates to the ndk docs based on approved messaging.
the incentive is to utilize an improvement made in the :hidden selector (for the videos page);
this update should also hopefully improve some performance, but it is otherwise the same
as before and this file still includes the core library, plus the UI core and resizable libraries
Automated import of CL 150428
Merge commit '1e96ac8430da922332e4c85e7eed0e95442ff2ce'
* commit '1e96ac8430da922332e4c85e7eed0e95442ff2ce':
Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed.
* changes:
page load perfomance improvements... remove the lists.js file from the <head>, which slows down page load a lot (over 300K), and instead load it dynamically on page load. also remove navtree_data.js from the <head>, which also slows the load and is only used in the reference when in tree view. This file is now loaded during the initialization of the nav tree.
The SDK build doesn't have recovery, don't try to generate a patch or
include it in the system image size calculation. Also there's a
dependency on bsdiff that was omitted.
The Android Open Source Project