commit b6062546c4702d4c0c3def706f45a176a7552e12
author Scott Main <smain@google.com> Tue Dec 13 13:15:23 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 13 13:15:23 2011 -0800
tree 96ed97d9b7ef0916f00bb824bac874dce11c1ab8
parent 0c70c88b4e163057f4b49ca55089cb5d82d2f96b
parent f9a0d6e9d727f0a8fe806f0089a28c8c6b0cdd83

am f9a0d6e9: am a5601068: am 514d1cdb: Merge "revisions to NewsReader sample app for AndroidU. Clean up XML markup for clean rendering in HTML docs; Change string resources for two-pane mode to bools; Rename resource files w/ layout info from main.xml to layouts.xml. 

* commit 'f9a0d6e9d727f0a8fe806f0089a28c8c6b0cdd83':
  revisions to NewsReader sample app for AndroidU. Clean up XML markup for clean rendering in HTML docs; Change string resources for two-pane mode to bools; Rename resource files w/ layout info from main.xml to layouts.xml. Add support lib Add HTML page