resolved conflicts for merge of 6da54b6e to master

Change-Id: Ic1e08fffacb66e8006877b7b5c51e9e7f03d39a2
2011-08-26 00:53:34 +02:00
parent d7d096df71 6da54b6e0e
commit 9d99d7dfb8
3 changed files with 7 additions and 0 deletions
--- a/core/main.mk
+++ b/core/main.mk
@@ -404,6 +404,7 @@ subdirs := \
 	development/host \
 	development/tools/etc1tool \
 	development/tools/line_endings \
+	development/tools/emulator/opengl \
 	external/clang \
 	external/easymock \
 	external/expat \