tree 9933e943a7f9da797ea01fff6c82377f67ecd3e0
parent 5a78f3984f232288da672bc0e9cac8b41a1f6edd
parent 80918c97737e6ddde0a144a59ddf7beb48a13d14
author Tianjie Xu <xunchang@google.com> 1527856408 -0700
committer android-build-merger <android-build-merger@google.com> 1527856408 -0700

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

Change-Id: Iedd79892a6ce7a079f82e1d84117a865ae4c7d5a