commit 901dd0074aacb36f79eb648402deca1ef4a7d12e
author Dirk Dougherty <nobody@android.com> Sat Jul 25 10:12:01 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sat Jul 25 10:12:01 2009 -0700
tree f5dec0ab1007c83673961c70350c4941b9ed87be
parent 8180f31b90d260c842613b78b3ae6b5ed151aa76
parent 233bc0b84aef261a67a364ff3a8e91077fd70fd6

am 233bc0b8: 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

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