Merge commit 'remotes/korg/cupcake'

Conflicts:
	core/java/com/android/internal/app/AlertController.java
	core/res/res/values/strings.xml
	media/java/android/media/AudioSystem.java
	services/java/com/android/server/LocationManagerService.java

1 files changed, 1 insertions, 1 deletions

diff --git a/opengl/libagl/vertex.cpp b/opengl/libagl/vertex.cpp
index 5bcc9dc95c..dad04d6cb5 100644
--- a/opengl/libagl/vertex.cpp
+++ b/opengl/libagl/vertex.cpp
@@ -99,7 +99,7 @@ void clipFrustumPerspective(ogles_context_t* c, vertex_t* v, uint32_t enables)
     c->arrays.cull &= clip;
 
     if (ggl_likely(!clip)) {
-        // if the vertice is clipped, we don't do the perspective
+        // if the vertex is clipped, we don't do the perspective
         // divide, since we don't need its window coordinates.
         perspective(c, v, enables);
     }