diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-04-02 16:15:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-02 16:15:59 +0000 |
| commit | 17b5ca1e665a1bbe17387b36fcce8f6b52513d5e (patch) | |
| tree | d966ca1c9a5a66a43e01d696d39a655339bf9b90 /opengl | |
| parent | 3ebb877e52a2661de56c3f44827f33824e735730 (diff) | |
| parent | dd46c864c12f592896e4da14758accbcd54afd10 (diff) | |
| download | frameworks_native-17b5ca1e665a1bbe17387b36fcce8f6b52513d5e.zip frameworks_native-17b5ca1e665a1bbe17387b36fcce8f6b52513d5e.tar.gz frameworks_native-17b5ca1e665a1bbe17387b36fcce8f6b52513d5e.tar.bz2 | |
Merge "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 |