tree 9b1e9c9c2a8aeed5de497fae4825b97068c4cad9
parent 8568d7e558f5aa1c4f05745eb764aeebb1d4da95
parent 7a97733f7ac3851214747d71c7d713e42f02e1e6
author Damien Bargiacchi <drb@google.com> 1473781956 +0000
committer android-build-merger <android-build-merger@google.com> 1473781956 +0000

Merge "Have gr_init_font alloc memory for the font" into cw-f-dev
am: 7a97733f7a

Change-Id: I24e0dae51d531adf51d8727d42ac69dd37290a03