tree 46a627fffcf793ebd1b225cb19647418e54d93df
parent 6422b8d051c93b4f34580c551254fc50c9efa4db
parent b4931c62bffec463df9c3871d83a35bbeb9d5920
author Paul Westbrook <pwestbro@google.com> 1358217880 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1358217881 -0800

Merge "Persist style spans in message bodies" into jb-ub-mail-ur8