| commit | 91d415ef4caf9b3d250a3901c9ee9a6a8012e89b | [log] [tgz] |
|---|---|---|
| author | James Lemieux <jplemieux@google.com> | Sun Nov 02 19:02:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 02 19:02:44 2014 +0000 |
| tree | a25cbf31c3b7d507ed899773bc6b0cd2018286bb | |
| parent | c8c3c7105ecfd0aecc0b7da1e4e1d0debc037a40 [diff] | |
| parent | f247d7e02e4aae32698256a5776f19760d27b0ea [diff] |
am f247d7e0: am 417c1ded: am c909ad16: am 826e61c0: am 69ba565b: Merge "Combined view should also display client-side sanitized HTML" into ub-gmail-ur14-dev * commit 'f247d7e02e4aae32698256a5776f19760d27b0ea': Combined view should also display client-side sanitized HTML