tree 08db6b17b4c56bbf54c7f3a7db14d295eebac38a
parent 64cedfe780c8d488f5f0f4df1279150a374a9212
parent f2099b7872d1366e62bef53e19db567d8c3976a8
author Tianjie Xu <xunchang@google.com> 1543517476 -0800
committer android-build-merger <android-build-merger@google.com> 1543517476 -0800

Merge "ImageGenerator: Handle special characters in xml files" am: 697003dbce
am: f2099b7872

Change-Id: Ia0b812f6441a712bde8441c742b7777948366042