Skip to content
Commit 37539f2d authored by Evan Chen's avatar Evan Chen Committed by Automerger Merge Worker
Browse files

Merge "Fix Security issue for Html.fromHtml without escape" into sc-dev am:... 

Merge "Fix Security issue for Html.fromHtml without escape" into sc-dev am: 535de78a am: 4fb82478 am: 0c99e3db am: d417a0da

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15560908

Change-Id: I38cb3e57230d6ee49eea3c9ab06d9eabb1e16f2f
parents 3696ab23 d417a0da
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment