tree 047a2771c1ebbb1f4ca0aa0ec06702bcf2a3812d
parent 2991503f8660727ac4ef4f57284034c83f43dca6
parent dea56f6531195314a5d36cae2b7f0e5fd56eaab7
author Tianjie Xu <xunchang@google.com> 1522432717 +0000
committer android-build-merger <android-build-merger@google.com> 1522432717 +0000

Merge "Remove the obsolete mkfont.c and font_10x18.h" am: 8b9faa0008
am: dea56f6531

Change-Id: Ib41259ebcdb59e9ceb58cc641b6ecb1a137fdc63