Merge commit 'd299b8194dde8c4875e5f032918ab35ebad8b1f1' * commit 'd299b8194dde8c4875e5f032918ab35ebad8b1f1': Add a new attribute to android manifest for defining the GLES version number.
Merge commit 'd299b8194dde8c4875e5f032918ab35ebad8b1f1' * commit 'd299b8194dde8c4875e5f032918ab35ebad8b1f1': Add a new attribute to android manifest for defining the GLES version number.