aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 61f99f13: am 245b5ea5: am 2af77026: am 67506023: am 05185e0e: am 48812401:...android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41marshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-devmarshmallow-devKonstantinos Menychtas2015-08-110-0/+0
|\
| * am 245b5ea5: am 2af77026: am 67506023: am 05185e0e: am 48812401: am 7f23b1d0:...Konstantinos Menychtas2015-08-110-0/+0
| |\
| | * am 2af77026: am 67506023: am 05185e0e: am 48812401: am 7f23b1d0: am a8f117d3:...Konstantinos Menychtas2015-08-110-0/+0
| | |\
| | | * am 67506023: am 05185e0e: am 48812401: am 7f23b1d0: am a8f117d3: am 5a571de3:...Konstantinos Menychtas2015-08-110-0/+0
| | | |\
| | | | * am 05185e0e: am 48812401: am 7f23b1d0: am a8f117d3: am 5a571de3: am 1a30e186:...Konstantinos Menychtas2015-08-110-0/+0
| | | | |\
| | | | | * am 48812401: am 7f23b1d0: am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09:...Konstantinos Menychtas2015-08-110-0/+0
| | | | | |\
| | | | | | * am 7f23b1d0: am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved con...Konstantinos Menychtas2015-08-110-0/+0
| | | | | | |\
| | | | | | | * am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for me...Konstantinos Menychtas2015-08-110-0/+0
| | | | | | | |\
| | | | | | | | * am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of 583026...Konstantinos Menychtas2015-08-110-0/+0
| | | | | | | | |\
| | | | | | | | | * am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-...Konstantinos Menychtas2015-08-110-0/+0
| | | | | | | | | |\
| | | | | | | | | | * am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aospKonstantinos Menychtas2015-08-110-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * resolved conflicts for merge of 5830261a to jb-dev-plus-aospKonstantinos Menychtas2015-08-090-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of bufferKonstantinos Menychtas2015-07-211-4/+6
* | | | | | | | | | | | | am df9c8e86: am 870db7fb: am 1c92675c: Merge "Update ADT plugin with lint API...android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r63android-6.0.1_r55android-6.0.1_r5android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r18android-6.0.1_r16android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-releasemarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-cts-releaseTor Norbye2015-04-091-1/+6
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am 870db7fb: am 1c92675c: Merge "Update ADT plugin with lint API change" into...Tor Norbye2015-04-091-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am 1c92675c: Merge "Update ADT plugin with lint API change" into studio-1.3-d...Tor Norbye2015-04-091-1/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge "Update ADT plugin with lint API change" into studio-1.3-dev automerge:...master-soongTor Norbye2015-04-091-1/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge "Update ADT plugin with lint API change" into studio-1.3-devstudio-master-releaseTor Norbye2015-04-091-1/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge "Update ADT plugin with lint API change" into studio-1.3-devTor Norbye2015-04-091-1/+6
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | Update ADT plugin with lint API changeTor Norbye2015-04-091-1/+6
| | | | | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | | | | am 52ff7c18: am 20d9be71: am ac1d4eda: Merge "Track tools/base API change in ...Tor Norbye2015-04-071-0/+13
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am 20d9be71: am ac1d4eda: Merge "Track tools/base API change in Eclipse plugi...Tor Norbye2015-04-071-0/+13
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am ac1d4eda: Merge "Track tools/base API change in Eclipse plugin" into studi...Tor Norbye2015-04-071-0/+13
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "Track tools/base API change in Eclipse plugin" into studio-1.3-dev aut...android-wear-5.1.1_r1android-wear-5.1.0_r1Tor Norbye2015-04-071-0/+13
| | | |\| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge "Track tools/base API change in Eclipse plugin" into studio-1.3-devTor Norbye2015-04-071-0/+13
| | | | |\| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | Merge "Track tools/base API change in Eclipse plugin" into studio-1.3-devTor Norbye2015-04-071-0/+13
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | Track tools/base API change in Eclipse pluginTor Norbye2015-04-061-0/+13
| | | | | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | | | | am 877d3a06: am 09b94fbb: am f9a43730: Merge "Update easymock version to 3.3"...Siva Velusamy2015-04-071-1/+1
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am 09b94fbb: am f9a43730: Merge "Update easymock version to 3.3" into studio-...Siva Velusamy2015-04-071-1/+1
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am f9a43730: Merge "Update easymock version to 3.3" into studio-1.3-dev autom...Siva Velusamy2015-04-071-1/+1
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "Update easymock version to 3.3" into studio-1.3-dev automerge: 1765a16Siva Velusamy2015-04-071-1/+1
| | | |\| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge "Update easymock version to 3.3" into studio-1.3-devSiva Velusamy2015-04-071-1/+1
| | | | |\| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | Merge "Update easymock version to 3.3" into studio-1.3-devSiva Velusamy2015-04-071-1/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | Update easymock version to 3.3Siva Velusamy2015-04-061-1/+1
| | | | | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | | | | am 8f178abd: am e5ffd506: am e6aac48c: Merge "Move to the new LayoutlibCallba...Deepanshu Gupta2015-04-021-4/+10
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am e5ffd506: am e6aac48c: Merge "Move to the new LayoutlibCallback." into stu...Deepanshu Gupta2015-04-021-4/+10
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am e6aac48c: Merge "Move to the new LayoutlibCallback." into studio-1.3-dev a...Deepanshu Gupta2015-04-021-4/+10
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "Move to the new LayoutlibCallback." into studio-1.3-dev automerge: 80e...Deepanshu Gupta2015-04-021-4/+10
| | | |\| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge "Move to the new LayoutlibCallback." into studio-1.3-devDeepanshu Gupta2015-04-021-4/+10
| | | | |\| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | Merge "Move to the new LayoutlibCallback." into studio-1.3-devDeepanshu Gupta2015-04-021-4/+10
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | Move to the new LayoutlibCallback.Deepanshu Gupta2015-04-021-4/+10
| | | | | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | | | | am b258ed26: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT ME...Qiwen Zhao2015-03-220-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.Qiwen Zhao2015-03-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am cb1da5eb: am a0bf2fac: Merge "Update tools to revision 23.0.4" into idea133Siva Velusamy2015-03-201-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d20c6a5c: am e3be25a2: Merge "Update ADT version to 23.0.4" into idea133Raphael Moll2015-03-2053-77/+77
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2bee0c98: am 9c676ef4: Merge "Match language-specific flags before default...Tor Norbye2015-03-201-11/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ddb5d875: am 972e1c6d: Merge "emulator/opengl: Cleanup build files + remov...David 'Digit' Turner2015-03-2062-6756/+84
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 35e336b1: am 956b01fd: Merge "gltrace: Increase launch timeout" into idea1...Siva Velusamy2015-03-201-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 44021bc2: am 39f4d677: Merge "Change Device List to Device Collection." in...Deepanshu Gupta2015-03-208-21/+27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9b41c2c1: am 5131332b: Merge "gltrace: Increase TEXTURE_UNIT_COUNT and MAX...Siva Velusamy2015-03-201-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-14 04:01:57 +0000