Merge "Make sure we put html in body_html and text in body_text"
tree: 45ac1ca87778e32661edd8ca7345f239e3e0af7e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. proguard.flags