tree 9933e943a7f9da797ea01fff6c82377f67ecd3e0
parent f5f2d8cc13a2a7136f2e6c7eee6975350d72eab7
parent 381fa3a7dba98b4ad7ec97f74230d28f167cc871
author Tianjie Xu <xunchang@google.com> 1527861109 -0700
committer android-build-merger <android-build-merger@google.com> 1527861109 -0700

Merge "Let gr_init proceed even if we failed to load a font file" am: 2d85a0f6f7 am: 80918c9773
am: 381fa3a7db

Change-Id: Iabed200255f5100334188de20a6f52b5f9b86a90