commit 0e7af778b59c0ff590e21fcce8cfc9176dc0d13d
author Nick Kralevich <nnk@google.com> Wed Apr 01 12:19:46 2015 -0700
committer Nick Kralevich <nnk@google.com> Wed Apr 01 12:19:46 2015 -0700
tree baf85c541a55a05fa97a9e00202b45ae8a9871cf
parent 1ef6591e7fded42fc7751b0c6c2003e0fd72f142
parent e2c7d491617321319ec4f7c3c67b746c2b5b6482

resolved conflicts for merge of e2c7d491 to master

Change-Id: I17cc5534c68d6cc1f35d294af7870b7037843525

mini_common.mk

diff --git a/mini_common.mk b/mini_common.mk
index 60b36b4..5b5dfb4 100644
--- a/mini_common.mk
+++ b/mini_common.mk
@@ -79,4 +79,5 @@
 $(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk)
 $(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
 $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
+$(call inherit-product-if-exists, external/roboto-fonts/fonts.mk)
 $(call inherit-product-if-exists, frameworks/base/data/sounds/AudioPackage5.mk)