tree 5b404bda9af8fbe4e1080e7da7ab93257070f16b
parent 3e18089c59a801ed55f491e0b1a8c7c860189986
parent c84de559413ac83730822268b9960c796391b746
author Evan Laird <evanlaird@google.com> 1569446298 -0700
committer android-build-merger <android-build-merger@google.com> 1569446298 -0700

Merge "[automerger skipped] DO NOT MERGE Allow for HTML styling in mobile data type content descriptions am: a3b5dd1b89 am: 2f373bfb5f -s ours
am: c84de55941 -s ours
am skip reason: subject contains skip directive

Change-Id: I293c2fcb63d31615b2aa508b3b56d0cb20f2cee7