tree a0a6b66b3e3f3fe45a1d1998a51f648452826b28
parent 0a53c37bce7cb27f4ff35cbc117ce7656076fc51
parent af364381706fabfbdf511af68fcbef6b4367dee0
author Tianjie Xu <xunchang@google.com> 1543637985 -0800
committer android-build-merger <android-build-merger@google.com> 1543637985 -0800

Merge "ImageGenerator: ignore the duplicate locales" am: 7846823125
am: af36438170

Change-Id: Idc119188727a1e261d8238db994389597c25635e