Skip to content
Commit ea589823 authored by Colin Cross's avatar Colin Cross
Browse files

Merge remote-tracking branch 'aosp/upstream' into master 

* 888b21f8 Merge pull request #124 from colincross/escape
* 41ca49ff Add proptools functions to escape strings

Bug: 31221587
Test: m -j
Change-Id: Idfed4304edae145b762d809c4289c4e5671cd65f
parents 6bbcbc94 888b21f8
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment