tree edf234f013ef3c88507f81dea65b8187cc672564
parent 6ec72e3fa9cdf9e896f3042fb1b1b4f3f6cea541
parent e52a5a5fca18348728dfc5609b42b88e9cc7ef98
author Mathias Agopian <mathias@google.com> 1242366263 -0700
committer Mathias Agopian <mathias@google.com> 1242366263 -0700

Merge commit 'goog/master' into merge_master

Conflicts:
	opengl/libagl/Android.mk
	opengl/libs/Android.mk
	opengl/libs/egl_impl.h