tree a1ab93ad23143900069d82511ab036a6957a6815
parent 79b293e84f1ce329d19c188b604592296ebef712
parent edcdab22c44a5fe4bb481396b1a2d7c9d73b60bc
author Siyamed Sinir <siyamed@google.com> 1524510473 -0700
committer android-build-merger <android-build-merger@google.com> 1524510473 -0700

[automerger skipped] Merge "Update fontchain_linter for emoji 11" into pi-dev am: 485a197ab0
am: edcdab22c4  -s ours

Change-Id: Ia840dd8b7aa590c8838549cd05da14a474543267