summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix inconsistant results for some cts tests."android-wear-5.1.1_r1android-wear-5.1.0_r1master-soongBo Hu2015-03-272-2/+20
|\
| * Fix inconsistant results for some cts tests.Douglas Leung2015-03-112-2/+20
* | Merge "Checking parameters for glCreateShader in guest"David Turner2015-03-271-0/+2
|\ \
| * | Checking parameters for glCreateShader in guestTina Zhang2015-03-271-0/+2
|/ /
* | Merge "Fix sdcard mount flag for goldfish device"David Turner2015-03-111-1/+1
|\ \ | |/ |/|
| * Fix sdcard mount flag for goldfish devicebohu2015-03-101-1/+1
|/
* am 33ae28bf: Merge "Fix implicit function declarations in goldfish."Elliott Hughes2015-02-212-0/+2
|\
| * Merge "Fix implicit function declarations in goldfish."Elliott Hughes2015-02-212-0/+2
| |\
| | * Fix implicit function declarations in goldfish.Elliott Hughes2015-02-192-0/+2
| |/
* | am 66896fd9: Merge "Proper comment on the usage mode in gralloc_alloc"bohu2015-02-020-0/+0
|\|
| * Merge "Proper comment on the usage mode in gralloc_alloc"bohu2015-02-021-8/+2
| |\
| | * Proper comment on the usage mode in gralloc_allocbohu2015-02-021-8/+2
| |/
* | resolved conflicts for merge of dd14cf86 to lmp-mr1-dev-plus-aospbohu2015-01-291-8/+2
|\ \
| * | guest system gles fix: Enable screen capture with gpu onandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releasebohu2015-01-291-6/+11
* | | am 9d209a04: Merge "guest system gles fix: Enable screen capture with gpu on"bohu2015-01-271-3/+14
|\ \ \ | | |/ | |/|
| * | Merge "guest system gles fix: Enable screen capture with gpu on"bohu2015-01-271-3/+14
| |\ \
| | * | guest system gles fix: Enable screen capture with gpu onbohu2015-01-261-3/+14
| |/ /
* | | am 7d9f6e9b: Merge "Set proper error code for glShaderBinary function"Bo Hu2015-01-232-0/+10
|\| |
| * | Merge "Set proper error code for glShaderBinary function"Bo Hu2015-01-222-0/+10
| |\ \
| | * | Set proper error code for glShaderBinary functionBo Hu2015-01-212-0/+10
* | | | am 6d171076: Merge "opengl: Regenerate GPU emulation encoder sources to fix N...bohu2015-01-151-8/+8
|\| | |
| * | | Merge "opengl: Regenerate GPU emulation encoder sources to fix NULL parameter...bohu2015-01-151-8/+8
| |\ \ \ | | |/ / | |/| |
| | * | opengl: Regenerate GPU emulation encoder sources to fix NULL parameters in so...bohu2015-01-141-8/+8
| |/ /
* | | am d72c930b: Merge "sensors: Add ranchu support."David Turner2015-01-101-0/+10
|\| |
| * | Merge "sensors: Add ranchu support."David Turner2015-01-101-0/+10
| |\ \
| | * | sensors: Add ranchu support.Christoffer Dall2015-01-101-0/+10
| |/ /
* | | am cf669ebb: Merge "sensors: Fix thread-safety + cleanup source code."David 'Digit' Turner2015-01-101-272/+316
|\| |
| * | Merge "sensors: Fix thread-safety + cleanup source code."David 'Digit' Turner2015-01-101-272/+316
| |\ \
| | * | sensors: Fix thread-safety + cleanup source code.David 'Digit' Turner2015-01-101-272/+316
| |/ /
* | | am cb4b5d2e: Merge "Fix missing #includes for the goldfish vibrator."Elliott Hughes2014-12-301-0/+1
|\| |
| * | Merge "Fix missing #includes for the goldfish vibrator."Elliott Hughes2014-12-291-0/+1
| |\ \
| | * | Fix missing #includes for the goldfish vibrator.Elliott Hughes2014-12-291-0/+1
| |/ /
* | | am 28a1a16e: Merge "Add parameters validation to glShaderSource() API"Bo Hu2014-12-173-1/+10
|\| |
| * | Merge "Add parameters validation to glShaderSource() API"Bo Hu2014-12-173-1/+10
| |\ \
| | * | Add parameters validation to glShaderSource() APITina Zhang2014-12-113-1/+10
* | | | am ba8d44b1: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang2014-12-162-2/+0
|\| | |
| * | | Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang2014-12-162-2/+0
| |\ \ \
| | * | | Cleanup Obsolete LOCAL_PRELINK_MODULE.Ying Wang2014-12-162-2/+0
| |/ / /
* | | | am a4f6c6ac: Merge "Suppress clang warnings on c++11-narrowing."Chih-Hung Hsieh2014-12-151-0/+2
|\| | |
| * | | Merge "Suppress clang warnings on c++11-narrowing."Chih-Hung Hsieh2014-12-151-0/+2
| |\ \ \
| | * | | Suppress clang warnings on c++11-narrowing.Chih-Hung Hsieh2014-12-121-0/+2
| |/ / /
* | | | am 069592df: Merge "Add shader version to glGetString"bohu2014-12-122-0/+7
|\| | |
| * | | Merge "Add shader version to glGetString"bohu2014-12-122-0/+7
| |\ \ \ | | |/ / | |/| |
| | * | Add shader version to glGetStringbohu2014-12-112-0/+7
| |/ /
* | | am 8142de3a: Fix a missed function override in GLEncoder.cppbohu2014-12-100-0/+0
|\ \ \ | | |/ | |/|
| * | Fix a missed function override in GLEncoder.cppbohu2014-12-101-0/+1
* | | am 5f23bd4a: Merge "Fix a missed function override in GLEncoder.cpp"David Turner2014-12-101-0/+1
|\ \ \ | | |/ | |/|
| * | Merge "Fix a missed function override in GLEncoder.cpp"android-wear-5.0.0_r1lollipop-wear-releaseDavid Turner2014-12-101-0/+1
| |\ \
| | * | Fix a missed function override in GLEncoder.cppbohu2014-12-091-0/+1
| |/ /
* | | am 8d97f574: Update goldfish from aosp/masterbohu2014-12-030-0/+0
|\ \ \ | | |/ | |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 05:04:12 +0000