OSDN Git Service

Merge "[automerger skipped] DO NOT MERGE Allow for HTML styling in mobile data type...
authorEvan Laird <evanlaird@google.com>
Wed, 25 Sep 2019 21:18:18 +0000 (14:18 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 Sep 2019 21:18:18 +0000 (14:18 -0700)
am: c84de55941 -s ours
am skip reason: subject contains skip directive

Change-Id: I293c2fcb63d31615b2aa508b3b56d0cb20f2cee7


Trivial merge