Jeff Davidson eb329c07c1 am 83f14309: Merge "Revert "Update protobuf library from 2.3 to 2.6."" ... * commit '83f14309f17af398ec8ff7f82d9b2f010ea7cd5f': Revert "Update protobuf library from 2.3 to 2.6."		2015-01-12 20:10:05 +00:00
..
include	opengl: Add EXT_primitive_bounding_box to registry	2014-05-19 12:54:05 -07:00
libagl	Remove unused LOCAL_LDLIBS.	2014-05-07 15:26:38 -07:00
libs	Revert "Update protobuf library from 2.3 to 2.6."	2015-01-12 20:00:33 +00:00
specs	GLConsumer: start using EGL_ANDROID_image_crop	2013-10-02 17:34:35 +00:00
tests	am bceb29c8: Merge "Fix clang -Wc++11-narrowing warnings."	2014-12-11 23:02:01 +00:00
tools	Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"	2014-12-02 00:34:51 +00:00