commit e6ef753ef6f134b6ff4fa1b30f0c3340a90f61af
author Glenn Kasten <gkasten@android.com> Wed Apr 02 16:27:10 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 02 16:27:10 2014 +0000
tree d0c3ee5474415811b456c32380b55eaacd8818d2
parent 9cfa49c95445b968da3170b4fdb0b942af69569e
parent fc1544d52d1232ccdf57a05704a013bad784f8f6

am fc1544d5: am 17b5ca1e: Merge "opengl: fix UAL conformity"

* commit 'fc1544d52d1232ccdf57a05704a013bad784f8f6':
  opengl: fix UAL conformity

opengl/libagl/fixed_asm.S

diff --git a/opengl/libagl/fixed_asm.S b/opengl/libagl/fixed_asm.S
index 05044f2..5e08856 100644
--- a/opengl/libagl/fixed_asm.S
+++ b/opengl/libagl/fixed_asm.S
@@ -17,7 +17,7 @@
 
 
     .text
-    .align
+    .align 2
     
     .global gglFloatToFixed
     .type gglFloatToFixed, %function

opengl/libagl/iterators.S

diff --git a/opengl/libagl/iterators.S b/opengl/libagl/iterators.S
index 8c86482..8fe9039 100644
--- a/opengl/libagl/iterators.S
+++ b/opengl/libagl/iterators.S
@@ -17,7 +17,7 @@
 
 
     .text
-    .align
+    .align 2
     .arm
     
     .global iterators0032