tree 1fccab58ea4ff229e8fbb555475b6b761b910c7c
parent 98462afa72e0e86a33c6789a676b3ce58de6ff1f
parent b3d92f0cf60aab2aae5090c123516dc3e9b19b4b
author Damien Bargiacchi <drb@google.com> 1473782843 +0000
committer android-build-merger <android-build-merger@google.com> 1473782843 +0000

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

Change-Id: Ic1e4374330bfa376746574f0977bf0dfbb7937ab