tree 01d5d6aeff938fbba7244193c7876dc6105a7800
parent b0d9b3594bd66a0769f73b8a424a1de8a94164ef
parent 2d85a0f6f7bbbaa559c206473dee995030dd4169
author Tianjie Xu <xunchang@google.com> 1527848094 -0700
committer android-build-merger <android-build-merger@google.com> 1527848094 -0700

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

Change-Id: I2c830126f9d6a060d321ce48e7602fc808836e11