[automerger skipped] DO NOT MERGE Allow for HTML styling in mobile data type content descriptions am: a3b5dd1b89 -s ours
am:b069e83cfe-s ours am skip reason: change_id Idf387111b0cdc34ad3762eac0ec6c2b484b393e3 with SHA183c87e50b1is in history Change-Id: Iae5e9db541805d8c022ec8dea91fe53fcb037b31
This commit is contained in: