tree c8914b42f690f9e2dd527d35b45345b4b37ff28f
parent 6dd3bf2e5017c92c37f3521c172c619052ca0cbf
parent 2f373bfb5f01d5692203480d0db47d8e15411957
author Evan Laird <evanlaird@google.com> 1569445497 -0700
committer android-build-merger <android-build-merger@google.com> 1569445497 -0700

[automerger skipped] DO NOT MERGE Allow for HTML styling in mobile data type content descriptions am: a3b5dd1b89
am: 2f373bfb5f -s ours
am skip reason: change_id Idf387111b0cdc34ad3762eac0ec6c2b484b393e3 with SHA1 83c87e50b1 is in history

Change-Id: I66072b4eea18d7813712b831d113b6f7af3cdb8f