diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-04-02 16:24:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-02 16:24:06 +0000 |
| commit | fc1544d52d1232ccdf57a05704a013bad784f8f6 (patch) | |
| tree | 354bb54ccdfe46d63a6ebc7ac4b3e43fcde23259 /opengl | |
| parent | b2f414fbd6e3be45bbea28d84db3ce9712ddcd5b (diff) | |
| parent | 17b5ca1e665a1bbe17387b36fcce8f6b52513d5e (diff) | |
| download | frameworks_native-fc1544d52d1232ccdf57a05704a013bad784f8f6.zip frameworks_native-fc1544d52d1232ccdf57a05704a013bad784f8f6.tar.gz frameworks_native-fc1544d52d1232ccdf57a05704a013bad784f8f6.tar.bz2 | |
am 17b5ca1e: Merge "opengl: fix UAL conformity"
* commit '17b5ca1e665a1bbe17387b36fcce8f6b52513d5e':
opengl: fix UAL conformity
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libagl/fixed_asm.S | 2 | ||||
| -rw-r--r-- | opengl/libagl/iterators.S | 2 |
2 files changed, 2 insertions, 2 deletions
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 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 |