tree 047a2771c1ebbb1f4ca0aa0ec06702bcf2a3812d
parent 9ce71aaa872a67af491782c87c25129f586d6231
parent 34f593b84cd2c112168cd426275c62af265e4b4c
author Tianjie Xu <xunchang@google.com> 1522443350 +0000
committer android-build-merger <android-build-merger@google.com> 1522443350 +0000

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

Change-Id: I8a5fd6e43bd53c6c1da8d23e94ee357a23ab3d69