am da069618: Merge commit \'db3b6e832261e7b9a09e1c646f7963b839d954cc\' into manualmergeDroiddoc

Browse Source

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).

...

This commit is contained in:

Dirk Dougherty 2009-07-25 10:12:07 -07:00 committed by Android Git Automerger

parent 353f53c1a6 da0696187b

commit 24f96bd17d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available