From 2cb3214e55f360fc76bc2ef1fe34359847c9d03f Mon Sep 17 00:00:00 2001
From: Seigo Nonaka <nona@google.com>
Date: Mon, 13 Mar 2017 16:42:46 -0700
Subject: [PATCH] Fix build failure due to unexpected merge.

FontLanguageListCache::kEmptyListId is gone, use kEmptyLanguageListId
instead.

Test: N/A
Change-Id: I96075849c53f23fbce8dbc180a51d8f97e45f316
---
 libs/minikin/FontFamily.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/minikin/FontFamily.cpp b/libs/minikin/FontFamily.cpp
index b5190c0ed30..e434f246893 100644
--- a/libs/minikin/FontFamily.cpp
+++ b/libs/minikin/FontFamily.cpp
@@ -118,7 +118,7 @@ FontFamily::FontFamily(std::vector<Font>&& fonts, const uint8_t* acceleratorTabl
 
 FontFamily::FontFamily(int variant, std::vector<Font>&& fonts, const uint8_t* acceleratorTable,
         size_t tableSize)
-    : FontFamily(FontLanguageListCache::kEmptyListId, variant, std::move(fonts), acceleratorTable,
+    : FontFamily(kEmptyLanguageListId, variant, std::move(fonts), acceleratorTable,
             tableSize) {
 }