aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix eols of some line from LF to CRLFandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devInseob Kim2018-02-231-8/+8
* Merge "[SDK tools] Support non-ASCII paths in 'mksdcard'" am: 7555c8dedf am: ...Jim Kaye2018-02-221-22/+57
|\
| * Merge "[SDK tools] Support non-ASCII paths in 'mksdcard'" am: 7555c8dedfJim Kaye2018-02-221-22/+57
| |\
| | * Merge "[SDK tools] Support non-ASCII paths in 'mksdcard'"Jim Kaye2018-02-221-22/+57
| | |\
| | | * Merge "[SDK tools] Support non-ASCII paths in 'mksdcard'"android-p-preview-1android-o-mr1-iot-preview-7o-mr1-iot-preview-7Jim Kaye2018-02-221-22/+57
| | | |\
| | | | * [SDK tools] Support non-ASCII paths in 'mksdcard'Jim Kaye2018-01-291-22/+57
* | | | | Add adb command to get max running usersAlex Chau2018-01-171-1/+11
* | | | | Merge "Remove unused local variable." am: 613a112d8e am: 99fdd0ccd6Chih-hung Hsieh2017-12-121-2/+2
|\| | | | | |_|_|/ |/| | |
| * | | Merge "Remove unused local variable." am: 613a112d8eChih-hung Hsieh2017-12-121-2/+2
|/| | | | |/ /
| * / Merge "Remove unused local variable."Chih-hung Hsieh2017-12-121-2/+2
|/| | | |/
| * Merge "Remove unused local variable."android-wear-8.0.0_r1Chih-hung Hsieh2017-12-121-2/+2
|/|
| * Remove unused local variable.Chih-Hung Hsieh2017-12-071-2/+2
|/
* Merge "Add OWNERS in sdk" am: 7fcb50b6f7 am: 4e91fed72b am: 2e170ea462oreo-mr1-devChih-hung Hsieh2017-06-231-0/+4
|\
| * Merge "Add OWNERS in sdk" am: 7fcb50b6f7 am: 4e91fed72bandroid-o-mr1-iot-preview-6o-mr1-iot-preview-6Chih-hung Hsieh2017-06-231-0/+4
|/|
| * Merge "Add OWNERS in sdk" am: 7fcb50b6f7android-o-mr1-preview-2android-o-mr1-preview-1Chih-hung Hsieh2017-06-231-0/+4
|/|
| * Merge "Add OWNERS in sdk"Chih-hung Hsieh2017-06-231-0/+4
| |\
| | * Merge "Add OWNERS in sdk"android-o-preview-4android-o-iot-preview-5o-iot-preview-5Chih-hung Hsieh2017-06-231-0/+4
| |/|
| | * Add OWNERS in sdkChih-Hung Hsieh2017-06-221-0/+4
| |/
* | Merge changes Ifc818a69,I433b33d0 am: be20684665 am: 576f858aaa am: e17dd6e292android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r34android-8.0.0_r33android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devoreo-cts-releaseDan Willemsen2016-08-126-305/+0
|\|
| * Merge changes Ifc818a69,I433b33d0 am: be20684665 am: 576f858aaaandroid-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-o-preview-1android-n-mr2-preview-2android-n-mr2-preview-1android-n-iot-preview-4o-previewn-iot-preview-4Dan Willemsen2016-08-126-305/+0
| |\
| | * Merge changes Ifc818a69,I433b33d0 am: be20684665Dan Willemsen2016-08-126-305/+0
| | |\
| | | * Merge changes Ifc818a69,I433b33d0android-n-mr1-preview-2android-n-mr1-preview-1Dan Willemsen2016-08-126-305/+0
| | |/|
| | | * Merge changes Ifc818a69,I433b33d0Dan Willemsen2016-08-126-305/+0
| | | |\
| | | | * Remove windows sdk whitelistDan Willemsen2015-08-282-62/+0
| | | | * Remove obsolete Android.mk filesDan Willemsen2015-08-284-243/+0
* | | | | find_java2: Fix deallocation bugGreg Kaiser2016-06-271-1/+1
* | | | | Merge "adb completion: call _init_completion if available" am: 1fa245bca1 am:...Kenny Root2016-05-031-4/+5
|\| | | |
| * | | | Merge "adb completion: call _init_completion if available" am: 1fa245bca1 am:...Kenny Root2016-05-031-4/+5
|/| | | | | |/ / /
| * | | Merge "adb completion: call _init_completion if available" am: 1fa245bca1Kenny Root2016-05-031-4/+5
|/| | |
| * | | Merge "adb completion: call _init_completion if available"Kenny Root2016-05-031-4/+5
|/| | | | |/ /
| * | Merge "adb completion: call _init_completion if available"android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Kenny Root2016-05-031-4/+5
|/| |
| * | adb completion: call _init_completion if availableKenny Root2016-04-271-4/+5
|/ /
* | 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
|\| | | |