am da069618: Merge commit \'db3b6e832261e7b9a09e1c646f7963b839d954cc\' into manualmergeDroiddoc
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).