aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Bash completion: Fix ls options and also support "shell cat""android-n-preview-2android-n-preview-1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r1afw-test-harness-2.1nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releaseSiva Velusamy2015-10-261-5/+9
|\
| * Merge "Bash completion: Fix ls options and also support "shell cat""Siva Velusamy2015-10-261-5/+9
| |\
| | * Bash completion: Fix ls options and also support "shell cat"Makoto Onuki2015-10-151-5/+9
| |/
* | am e8826f62: am f5fb0250: Merge "Complete subcommands for dumpsys, am and pm."Makoto Onuki2015-10-031-13/+103
|\|
| * am f5fb0250: Merge "Complete subcommands for dumpsys, am and pm."Makoto Onuki2015-10-031-13/+103
| |\
| | * Merge "Complete subcommands for dumpsys, am and pm."Makoto Onuki2015-10-021-13/+103
| | |\
| | | * Complete subcommands for dumpsys, am and pm.Makoto Onuki2015-10-021-13/+103
| | |/
* | | am 5dedc164: am aaf3469f: Merge "Update windows sdk build instructions"Dan Willemsen2015-09-111-77/+13
|\| |
| * | am aaf3469f: Merge "Update windows sdk build instructions"Dan Willemsen2015-09-111-77/+13
| |\|
| | * Merge "Update windows sdk build instructions"Dan Willemsen2015-09-111-77/+13
| | |\
| | | * Update windows sdk build instructionsDan Willemsen2015-09-091-77/+13
| | |/
* | | am 238a03a3: (-s ours) am c78d07c6: am 61f99f13: am 245b5ea5: am 2af77026: am...Konstantinos Menychtas2015-08-270-0/+0
|\| |
| * | am c78d07c6: am 61f99f13: am 245b5ea5: am 2af77026: am 67506023: am 05185e0e:...Konstantinos Menychtas2015-08-110-0/+0
| |\ \
* | | | am c2394f9e: (-s ours) am b51fc0b2: Merge "adb tab completion: remove extrane...Kenny Root2015-08-270-0/+0
|\| | |
| * | | am b51fc0b2: Merge "adb tab completion: remove extraneous state"Kenny Root2015-07-161-2/+0
| |\ \ \ | | | |/ | | |/|
* | | | am ff189baa: (-s ours) am 824c4ac7: Merge "Fix build when OUT_DIR is not set....Chris Warrington2015-08-270-0/+0
|\| | |
| * | | am 824c4ac7: Merge "Fix build when OUT_DIR is not set." into studio-1.4-dev a...Chris Warrington2015-07-071-3/+4
| |\ \ \
* | | | | am 24dd4cd7: (-s ours) am b0344cf0: Merge "Supporting path specified by build...Joe Baker-Malone2015-08-270-0/+0
|\| | | |
| * | | | am b0344cf0: Merge "Supporting path specified by build_tools.sh" into studio-...Joe Baker-Malone2015-07-071-3/+10
| |\ \ \ \
* | | | | | am bffde0a6: (-s ours) am 334d9faa: Merge "Proguard: Only keep parcelables if...Chris Warrington2015-08-270-0/+0
|\| | | | |
| * | | | | am 334d9faa: Merge "Proguard: Only keep parcelables if they are used." into s...Chris Warrington2015-07-072-4/+4
| |\ \ \ \ \
* | | | | | | am 83d4b7dd: (-s ours) am 407771dd: Merge "Track lint API change" into studio...Tor Norbye2015-08-270-0/+0
|\| | | | | |
| * | | | | | am 407771dd: Merge "Track lint API change" into studio-1.4-dev automerge: 131...Tor Norbye2015-07-061-1/+2
| |\ \ \ \ \ \
* | \ \ \ \ \ \ am c78d07c6: am 61f99f13: am 245b5ea5: am 2af77026: am 67506023: am 05185e0e:...Konstantinos Menychtas2015-08-110-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | 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 b51fc0b2: Merge "adb tab completion: remove extraneous state"Kenny Root2015-07-161-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "adb tab completion: remove extraneous state"android-m-preview-2Kenny Root2015-07-161-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | adb tab completion: remove extraneous stateKenny Root2015-07-091-2/+0
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | am 824c4ac7: Merge "Fix build when OUT_DIR is not set." into studio-1.4-dev a...Chris Warrington2015-07-071-3/+4
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Fix build when OUT_DIR is not set." into studio-1.4-dev automerge: ea1...android-m-preview-1Chris Warrington2015-07-071-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Fix build when OUT_DIR is not set." into studio-1.4-devChris Warrington2015-07-071-3/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix build when OUT_DIR is not set." into studio-1.4-devChris Warrington2015-07-071-3/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | Fix build when OUT_DIR is not set.Chris Warrington2015-07-071-3/+4
| | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am b0344cf0: Merge "Supporting path specified by build_tools.sh" into studio-...Joe Baker-Malone2015-07-071-3/+10
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "Supporting path specified by build_tools.sh" into studio-1.4-dev autom...Joe Baker-Malone2015-07-071-3/+10
| |\| | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Supporting path specified by build_tools.sh" into studio-1.4-devJoe Baker-Malone2015-07-071-3/+10
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Supporting path specified by build_tools.sh" into studio-1.4-devJoe Baker-Malone2015-07-071-3/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | Supporting path specified by build_tools.shJoe Baker-Malone2015-07-071-3/+10