tree ee4c66596c7198d70ddd716bbb3c5fb0ad7e5e9c
parent c4303bdabdd0a173e6fc7886a196991e924cd862
parent e9644676caca8f414be13c31552852b299cefc5b
author Evan Laird <evanlaird@google.com> 1569436362 -0700
committer android-build-merger <android-build-merger@google.com> 1569436362 -0700

[automerger skipped] DO NOT MERGE Allow for HTML styling in mobile data type content descriptions am: 83c87e50b1
am: e9644676ca -s ours
am skip reason: subject contains skip directive

Change-Id: If80d093b4083a4d98b7ef528012827c3a29f4d8c