Gitiles
Code Review
Sign In
gerrit-public.fairphone.software
/
fp2-dev
/
platform
/
development
/
b6d84fde9f9e2e6f53000ec44ea5ccdf72262ce5
b6d84fd
resolved conflicts for merge of ce28e097 to master
by Dianne Hackborn
· 13 years ago
ce28e09
am 67117872: am b181a0d1: Merge "New API demos showing use of tabs with fragments." into honeycomb-mr2
by Dianne Hackborn
· 13 years ago
6711787
am b181a0d1: Merge "New API demos showing use of tabs with fragments." into honeycomb-mr2
by Dianne Hackborn
· 13 years ago
b181a0d
Merge "New API demos showing use of tabs with fragments." into honeycomb-mr2
by Dianne Hackborn
· 13 years ago
be6b6b4
New API demos showing use of tabs with fragments.
by Dianne Hackborn
· 13 years ago
bc85db5
am 68a87a4a: am d0e6d6f7: am 6f24f89c: Merge "Adds the Random Music Player sample." into honeycomb-mr2
by Bruno Oliveira
· 13 years ago
68a87a4
am d0e6d6f7: am 6f24f89c: Merge "Adds the Random Music Player sample." into honeycomb-mr2
by Bruno Oliveira
· 13 years ago
d0e6d6f
am 6f24f89c: Merge "Adds the Random Music Player sample." into honeycomb-mr2
by Bruno Oliveira
· 13 years ago
6f24f89
Merge "Adds the Random Music Player sample." into honeycomb-mr2
by Bruno Oliveira
· 13 years ago
67b3e5a
am e41a5eac: am 7b659b11: am 742a85dc: am 0e5c2beb: Merge "First commit of the system egl implementation."
by David Turner
· 13 years ago
e41a5ea
am 7b659b11: am 742a85dc: am 0e5c2beb: Merge "First commit of the system egl implementation."
by David Turner
· 13 years ago
7b659b1
am 742a85dc: am 0e5c2beb: Merge "First commit of the system egl implementation."
by David Turner
· 13 years ago
742a85d
am 0e5c2beb: Merge "First commit of the system egl implementation."
by David Turner
· 13 years ago
0e5c2be
Merge "First commit of the system egl implementation."
by David Turner
· 13 years ago
37db3de
First commit of the system egl implementation.
by Stas Gurtovoy
· 13 years ago
043c059
am 58c9ec5a: am 1ccce78e: am e490d50e: am 8c7d5519: Merge "opengl translator: make GLcommon static library"
by David Turner
· 13 years ago
416c517
am 0e4f5620: am f61e7a3c: am 94f566f8: am cc3b3887: Merge "opengl translator: moved some types out of eglplatform.h"
by David Turner
· 13 years ago
5ebbc3a
am 8d6b45e8: am ee00d4b4: am 7870c9f5: am 8a96cb7e: Merge "opengl translator: initialize dispatch with dummy functions"
by David Turner
· 13 years ago
5e893e1
Merge "Building with full librs"
by Alex Sakhartchouk
· 13 years ago
5146b97
am 534f6c2d: am 514c8cb5: am e4ccbd68: Use a function to package android support libraries.
by Ying Wang
· 13 years ago
0b743e7
am b6b866c5: am 638e7d8b: am 5f82c3ab: am a1b9f9bc: Merge "implementing mac OS support for translator\'s libs"
by David Turner
· 13 years ago
c085876
am 1a77f754: am 2e8d5e1d: am 4de570c9: am f3c023e4: Merge "opengl translator: GLSL ES translation"
by David Turner
· 13 years ago
593737d
am a3d243e0: am 9178b80c: am eae0aff8: am 87043c4e: Merge "opengl translator: added EGL_RENDERABLE_TYPE attrib"
by David Turner
· 13 years ago
3466ced
am 3d03d485: am e3ca49a9: am 3b987d0c: am a2c959d5: Merge "fixes for gles2 tests"
by David Turner
· 13 years ago
0a52633
am 8c5259cd: am 3ba3156e: am a68506a3: am bcec626f: Merge "add gles2 extensions"
by David Turner
· 13 years ago
124643d
am f19483e5: am 1251787f: am 5af3c174: am 4bf1d504: Merge "implement GL_OES_draw_texture"
by David Turner
· 13 years ago
e31f329
am d07b6c87: am e1beb756: am f26f4dd7: am ffe663de: Merge "Add gles 1 extension implementation to translator"
by David Turner
· 13 years ago
b693bff
am c89cd7af: am 0777f78e: am a2e0e64a: am 61287c50: Merge "removed old/obsolete file GLEScontext.cpp"
by David Turner
· 13 years ago
f674de8
am ea4284a7: am f3c78295: am e6868d1e: am 299a140c: Merge "Fix issues raised by the GLES 1.1 conformance test"
by David Turner
· 13 years ago
cd25a18
am 0677b7a1: am f68103bf: am 1e4d92ca: am 67032b23: Merge "Fix a bug where eglMakeCurrent(NULL) did not work"
by David Turner
· 13 years ago
2d6f324
am 0c5fb2ee: am b848ebfe: am 62f593fa: am 7660bb58: Merge "Fix a mess in contexts/surfaces reference count"
by David Turner
· 13 years ago
1283d8d
am 331b2a6f: am 6d0d6ef1: am fc618484: Merge from gingerbread
by Jean-Baptiste Queru
· 13 years ago
184bfc4
am 01dca04f: am 5eac0624: am 8821d5a5: Merge "ThreadInfo- use explicit rather than void pointers"
by David Turner
· 13 years ago
f4db81b
am 1a34e175: am 3f232d30: am 0b05185e: Merge "Fix version returned by eglInitialize from 4.1 to 1.4."
by David Turner
· 13 years ago
3b2f4ee
am f90611b8: am 9448b1c2: am 8c141dd2: Merge "EglChooseConfig should handle the case where "configs" is NULL."
by David Turner
· 13 years ago
dc4a727
am cb802ae3: am 6d70e8c3: am bf483268: Merge "Emulators\'s GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_C
by David Turner
· 13 years ago
0e5c937
Merge "Fix runtest build step."
by Brett Chabot
· 13 years ago
546a328
Fix runtest build step.
by Brett Chabot
· 13 years ago
f3fdaca
am 733342c7: am 76fb8500: am 80f84422: Add v13 to the compatibility package.
by Xavier Ducrohet
· 13 years ago
5ac5b70
am b257bb8a: am e9c7386b: am e011bed4: Merge "ndk: x86: Sanitize platform headers and libraries."
by David 'Digit' Turner
· 13 years ago
58c9ec5
am 1ccce78e: am e490d50e: am 8c7d5519: Merge "opengl translator: make GLcommon static library"
by David Turner
· 13 years ago
0e4f562
am f61e7a3c: am 94f566f8: am cc3b3887: Merge "opengl translator: moved some types out of eglplatform.h"
by David Turner
· 13 years ago
8d6b45e
am ee00d4b4: am 7870c9f5: am 8a96cb7e: Merge "opengl translator: initialize dispatch with dummy functions"
by David Turner
· 13 years ago
97748e0
Merge "Make runtest reboot and root more robust."
by Brett Chabot
· 13 years ago
534f6c2
am 514c8cb5: am e4ccbd68: Use a function to package android support libraries.
by Ying Wang
· 13 years ago
514c8cb
am e4ccbd68: Use a function to package android support libraries.
by Ying Wang
· 13 years ago
b6b866c
am 638e7d8b: am 5f82c3ab: am a1b9f9bc: Merge "implementing mac OS support for translator\'s libs"
by David Turner
· 13 years ago
1a77f75
am 2e8d5e1d: am 4de570c9: am f3c023e4: Merge "opengl translator: GLSL ES translation"
by David Turner
· 13 years ago
a3d243e
am 9178b80c: am eae0aff8: am 87043c4e: Merge "opengl translator: added EGL_RENDERABLE_TYPE attrib"
by David Turner
· 13 years ago
3d03d48
am e3ca49a9: am 3b987d0c: am a2c959d5: Merge "fixes for gles2 tests"
by David Turner
· 13 years ago
8c5259c
am 3ba3156e: am a68506a3: am bcec626f: Merge "add gles2 extensions"
by David Turner
· 13 years ago
f19483e
am 1251787f: am 5af3c174: am 4bf1d504: Merge "implement GL_OES_draw_texture"
by David Turner
· 13 years ago
d07b6c8
am e1beb756: am f26f4dd7: am ffe663de: Merge "Add gles 1 extension implementation to translator"
by David Turner
· 13 years ago
c89cd7a
am 0777f78e: am a2e0e64a: am 61287c50: Merge "removed old/obsolete file GLEScontext.cpp"
by David Turner
· 13 years ago
ea4284a
am f3c78295: am e6868d1e: am 299a140c: Merge "Fix issues raised by the GLES 1.1 conformance test"
by David Turner
· 13 years ago
0677b7a
am f68103bf: am 1e4d92ca: am 67032b23: Merge "Fix a bug where eglMakeCurrent(NULL) did not work"
by David Turner
· 13 years ago
0c5fb2e
am b848ebfe: am 62f593fa: am 7660bb58: Merge "Fix a mess in contexts/surfaces reference count"
by David Turner
· 13 years ago
331b2a6
am 6d0d6ef1: am fc618484: Merge from gingerbread
by Jean-Baptiste Queru
· 13 years ago
01dca04
am 5eac0624: am 8821d5a5: Merge "ThreadInfo- use explicit rather than void pointers"
by David Turner
· 13 years ago
1a34e17
am 3f232d30: am 0b05185e: Merge "Fix version returned by eglInitialize from 4.1 to 1.4."
by David Turner
· 13 years ago
f90611b
am 9448b1c2: am 8c141dd2: Merge "EglChooseConfig should handle the case where "configs" is NULL."
by David Turner
· 13 years ago
cb802ae
am 6d70e8c3: am bf483268: Merge "Emulators\'s GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into
by David Turner
· 13 years ago
e4ccbd6
Use a function to package android support libraries.
by Ying Wang
· 13 years ago
518936d
am b36c8d68: am 0a9365f8: am 7ffb7d4b: Update pager demos to match new v4 ViewPager API.
by Dianne Hackborn
· 13 years ago
733342c
am 76fb8500: am 80f84422: Add v13 to the compatibility package.
by Xavier Ducrohet
· 13 years ago
76fb850
am 80f84422: Add v13 to the compatibility package.
by Xavier Ducrohet
· 13 years ago
cdfaae1
Make runtest reboot and root more robust.
by Brett Chabot
· 13 years ago
8207c89
Merge "Remove runtest hard dependency on test_defs.xml files."
by Brett Chabot
· 13 years ago
3c9cefc
Remove runtest hard dependency on test_defs.xml files.
by Brett Chabot
· 13 years ago
1ccce78
am e490d50e: am 8c7d5519: Merge "opengl translator: make GLcommon static library"
by David Turner
· 13 years ago
e490d50
am 8c7d5519: Merge "opengl translator: make GLcommon static library"
by David Turner
· 13 years ago
8c7d551
Merge "opengl translator: make GLcommon static library"
by David Turner
· 13 years ago
cd1489a
opengl translator: make GLcommon static library
by Guy Zadikario
· 13 years ago
f61e7a3
am 94f566f8: am cc3b3887: Merge "opengl translator: moved some types out of eglplatform.h"
by David Turner
· 13 years ago
ee00d4b
am 7870c9f5: am 8a96cb7e: Merge "opengl translator: initialize dispatch with dummy functions"
by David Turner
· 13 years ago
94f566f
am cc3b3887: Merge "opengl translator: moved some types out of eglplatform.h"
by David Turner
· 13 years ago
7870c9f
am 8a96cb7e: Merge "opengl translator: initialize dispatch with dummy functions"
by David Turner
· 13 years ago
cc3b388
Merge "opengl translator: moved some types out of eglplatform.h"
by David Turner
· 13 years ago
8a96cb7
Merge "opengl translator: initialize dispatch with dummy functions"
by David Turner
· 13 years ago
b30a301
Adds the Random Music Player sample.
by Bruno Oliveira
· 13 years ago
80f8442
Add v13 to the compatibility package.
by Xavier Ducrohet
· 13 years ago
b257bb8
am e9c7386b: am e011bed4: Merge "ndk: x86: Sanitize platform headers and libraries."
by David 'Digit' Turner
· 13 years ago
b36c8d6
am 0a9365f8: am 7ffb7d4b: Update pager demos to match new v4 ViewPager API.
by Dianne Hackborn
· 13 years ago
0a9365f
am 7ffb7d4b: Update pager demos to match new v4 ViewPager API.
by Dianne Hackborn
· 13 years ago
7ffb7d4
Update pager demos to match new v4 ViewPager API.
by Dianne Hackborn
· 13 years ago
638e7d8
am 5f82c3ab: am a1b9f9bc: Merge "implementing mac OS support for translator\'s libs"
by David Turner
· 13 years ago
2e8d5e1
am 4de570c9: am f3c023e4: Merge "opengl translator: GLSL ES translation"
by David Turner
· 13 years ago
9178b80
am eae0aff8: am 87043c4e: Merge "opengl translator: added EGL_RENDERABLE_TYPE attrib"
by David Turner
· 13 years ago
5f82c3a
am a1b9f9bc: Merge "implementing mac OS support for translator\'s libs"
by David Turner
· 13 years ago
4de570c
am f3c023e4: Merge "opengl translator: GLSL ES translation"
by David Turner
· 13 years ago
eae0aff
am 87043c4e: Merge "opengl translator: added EGL_RENDERABLE_TYPE attrib"
by David Turner
· 13 years ago
0db9dae
opengl translator: moved some types out of eglplatform.h
by Amit Feller
· 13 years ago
c879e1c
opengl translator: initialize dispatch with dummy functions
by Amit Feller
· 13 years ago
a1b9f9b
Merge "implementing mac OS support for translator's libs"
by David Turner
· 13 years ago
f3c023e
Merge "opengl translator: GLSL ES translation"
by David Turner
· 13 years ago
87043c4
Merge "opengl translator: added EGL_RENDERABLE_TYPE attrib"
by David Turner
· 13 years ago
3dd22a5
implementing mac OS support for translator's libs
by Amit Feller
· 13 years ago
dd26774
opengl translator: GLSL ES translation
by Amit Feller
· 13 years ago
d61fb75
opengl translator: added EGL_RENDERABLE_TYPE attrib
by Amit Feller
· 13 years ago
e3ca49a
am 3b987d0c: am a2c959d5: Merge "fixes for gles2 tests"
by David Turner
· 13 years ago
Next »