commit 28af35e8cdc601c7ab9c7287d9e72fdc331e8a9d
author Ying Wang <wangying@google.com> Tue Apr 09 23:21:42 2013 -0700
committer Ying Wang <wangying@google.com> Tue Apr 09 23:21:42 2013 -0700
tree 2eda89e8e3e1c72cf73920a4eaaddcda7ade3a30
parent 171af247589f63fffee37a0e81a975afb62279a2
parent a976bddd9cfff0be5703484009ea875dee5d2456

resolved conflicts for merge of a976bddd to master

Change-Id: I64e1cbfb0eee891ce4d1eee40eefdcedcc501f7f

libs/hwui/Android.mk

diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk
index 2eef91b..78da8e3 100644
--- a/libs/hwui/Android.mk
+++ b/libs/hwui/Android.mk
@@ -55,7 +55,7 @@
 
 	LOCAL_CFLAGS += -DUSE_OPENGL_RENDERER -DGL_GLEXT_PROTOTYPES
 	LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-	LOCAL_SHARED_LIBRARIES := libcutils libutils libGLESv2 libskia libui
+	LOCAL_SHARED_LIBRARIES := liblog libcutils libutils libGLESv2 libskia libui
 	LOCAL_MODULE := libhwui
 	LOCAL_MODULE_TAGS := optional