OSDN Git Service

Fix build which is due to a poor merge
authorBill Yi <byi@google.com>
Thu, 30 Oct 2014 20:39:22 +0000 (13:39 -0700)
committerBill Yi <byi@google.com>
Thu, 30 Oct 2014 20:39:22 +0000 (13:39 -0700)
commita8e28d79dd3da540746a793a33a450584c805511
treedaa17673c297c7aa37e35a1a004743e908f87be5
parent1b66faf09bc898083b00fb45a316f2f8ed945249
Fix build which is due to a poor merge

Related commit: fbb8828965084a753f04263f3265d68acbfdc7ab

BUG:18155628
system/GLESv1_enc/gl_enc.h