Commit afaa0490500c539f9a0e1c6432514444a9d10076

michaelbai@google.com 2011-11-21T21:14:23

Upstream android's change for angle BUG= TEST= Review URL: http://codereview.appspot.com/5410050 git-svn-id: https://angleproject.googlecode.com/svn/trunk@887 736b8ea6-26fd-11df-bfd4-992fa37f6226