Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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-release | Dan Willemsen | 2016-08-12 | 6 | -305/+0 |
|\ | | | | | | | | | | | am: 1da8730be2 Change-Id: I8b569d223dcc896c2fdce51e92d1d4096e9d413e | ||||
| * | 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-4 | Dan Willemsen | 2016-08-12 | 6 | -305/+0 |
| |\ | | | | | | | | | | | | | | | | am: e17dd6e292 Change-Id: I138d1f62987b5c2e3328e5ffa101feb592768cea | ||||
| | * | Merge changes Ifc818a69,I433b33d0 am: be20684665 | Dan Willemsen | 2016-08-12 | 6 | -305/+0 |
| | |\ | | | | | | | | | | | | | | | | | | | | | am: 576f858aaa Change-Id: I08ff1baa822c2ca93df858795c4f3d7d263b454e | ||||
| | | * | Merge changes Ifc818a69,I433b33d0android-n-mr1-preview-2android-n-mr1-preview-1 | Dan Willemsen | 2016-08-12 | 6 | -305/+0 |
| | |/| | | | | | | | | | | | | | | | | | | | | | am: be20684665 Change-Id: Ia0317936d62a1ec11e2bd6e4fd67ad3bc55de6d9 | ||||
| | | * | Merge changes Ifc818a69,I433b33d0 | Dan Willemsen | 2016-08-12 | 6 | -305/+0 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Remove windows sdk whitelist Remove obsolete Android.mk files | ||||
| | | | * | Remove windows sdk whitelist | Dan Willemsen | 2015-08-28 | 2 | -62/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23566667 Change-Id: Ifc818a69c89eec1e5324ed3c4abb0b853d4bda27 | ||||
| | | | * | Remove obsolete Android.mk files | Dan Willemsen | 2015-08-28 | 4 | -243/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tools no longer build under the platform build, remove the Android.mk files. Bug: 23566667 Change-Id: I433b33d0dc1944e3d6345ddd3265bc0b975327be | ||||
* | | | | | find_java2: Fix deallocation bug | Greg Kaiser | 2016-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 'fviBuffer' was allocated with an array new, it needs to be deallocated with an array delete. Change-Id: I0a96ec78b0d230f64566ad16df0a58c9cdc7e043 | ||||
* | | | | | Merge "adb completion: call _init_completion if available" am: 1fa245bca1 ↵ | Kenny Root | 2016-05-03 | 1 | -4/+5 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e40f505ad8 am: 275c334042 am: 94cd68b460 * commit '94cd68b4606df4bca9101875662eb21734484630': adb completion: call _init_completion if available Change-Id: I14a3a951d7a4ce4aa67d55beee98d7e60ea8a847 | ||||
| * | | | | Merge "adb completion: call _init_completion if available" am: 1fa245bca1 ↵ | Kenny Root | 2016-05-03 | 1 | -4/+5 |
|/| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e40f505ad8 am: 275c334042 * commit '275c334042945a257097ce4a981c3f462a4b5f14': adb completion: call _init_completion if available Change-Id: I53183604dcc785423eaab8890ce8ed3700a29575 | ||||
| * | | | Merge "adb completion: call _init_completion if available" am: 1fa245bca1 | Kenny Root | 2016-05-03 | 1 | -4/+5 |
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e40f505ad8 * commit 'e40f505ad88d42655973f34c27efd562df9de7a8': adb completion: call _init_completion if available Change-Id: I1ebab46aa2d804c37eefafbda8cc9c46235d8e00 | ||||
| * | | | Merge "adb completion: call _init_completion if available" | Kenny Root | 2016-05-03 | 1 | -4/+5 |
|/| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | am: 1fa245bca1 * commit '1fa245bca1e1ca7443913a52b0e8e0bb465b5fe3': adb completion: call _init_completion if available Change-Id: I060450788a7e78802a1780f65ab26b7eec32c349 | ||||
| * | | 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-2 | Kenny Root | 2016-05-03 | 1 | -4/+5 |
|/| | | |||||
| * | | adb completion: call _init_completion if available | Kenny Root | 2016-04-27 | 1 | -4/+5 |
|/ / | | | | | | | | | | | | | | | If there was a shell redirection in the command line, you need to have some logic to handle it. Luckily bash-completion packages on most distributions have that logic already. Call it if it's available. Change-Id: I481cb4bf9e34ce46159378252a5c9a5c4934a11b | ||||
* | | 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-release | Siva Velusamy | 2015-10-26 | 1 | -5/+9 |
|\ \ | | | | | | | | | | | | | | | | | | | am: 9d7a46cfa2 * commit '9d7a46cfa2bdf2cfa681082488b60b35fdc46059': Bash completion: Fix ls options and also support "shell cat" | ||||
| * \ | Merge "Bash completion: Fix ls options and also support "shell cat"" | Siva Velusamy | 2015-10-26 | 1 | -5/+9 |
| |\ \ | |||||
| | * | | Bash completion: Fix ls options and also support "shell cat" | Makoto Onuki | 2015-10-15 | 1 | -5/+9 |
| |/ / | | | | | | | | | | Change-Id: I93d767f17fec35bc386ee8da42ea4831d4df1553 | ||||
* | | | am e8826f62: am f5fb0250: Merge "Complete subcommands for dumpsys, am and pm." | Makoto Onuki | 2015-10-03 | 1 | -13/+103 |
|\| | | | | | | | | | | | | | | * commit 'e8826f6285217ccf821563f4bf3546c7d230e1c4': Complete subcommands for dumpsys, am and pm. | ||||
| * | | am f5fb0250: Merge "Complete subcommands for dumpsys, am and pm." | Makoto Onuki | 2015-10-03 | 1 | -13/+103 |
| |\ \ | | | | | | | | | | | | | | | | | * commit 'f5fb02509c6c2f732618e7acb1aa33dc5f8c45ff': Complete subcommands for dumpsys, am and pm. | ||||
| | * \ | Merge "Complete subcommands for dumpsys, am and pm." | Makoto Onuki | 2015-10-02 | 1 | -13/+103 |
| | |\ \ | |||||
| | | * | | Complete subcommands for dumpsys, am and pm. | Makoto Onuki | 2015-10-02 | 1 | -13/+103 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | Also make the ls completion work with the new ls command. Change-Id: Ied6d7e22f063a5d214b7a11495ae302b2b0cc165 | ||||
* | | | | am 5dedc164: am aaf3469f: Merge "Update windows sdk build instructions" | Dan Willemsen | 2015-09-11 | 1 | -77/+13 |
|\| | | | | | | | | | | | | | | | | | | | * commit '5dedc1647b3c85c7eaaaab8e30e585e3f1d9e64b': Update windows sdk build instructions | ||||
| * | | | am aaf3469f: Merge "Update windows sdk build instructions" | Dan Willemsen | 2015-09-11 | 1 | -77/+13 |
| |\| | | | | | | | | | | | | | | | | | | * commit 'aaf3469f0235842f906688023a4e11744200c011': Update windows sdk build instructions | ||||
| | * | | Merge "Update windows sdk build instructions" | Dan Willemsen | 2015-09-11 | 1 | -77/+13 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Update windows sdk build instructions | Dan Willemsen | 2015-09-09 | 1 | -77/+13 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | Cygwin has been unsupported, and the mingw instructions just got simpler. Bug: 23566667 Change-Id: Idb226dfe897acb6393765720bb5f71482868f081 | ||||
* | | | am 238a03a3: (-s ours) am c78d07c6: am 61f99f13: am 245b5ea5: am 2af77026: ↵ | Konstantinos Menychtas | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | am 67506023: am 05185e0e: am 48812401: am 7f23b1d0: am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp * commit '238a03a3d1ddd280c97e072646212252f02933ed': | ||||
| * | | am c78d07c6: am 61f99f13: am 245b5ea5: am 2af77026: am 67506023: am ↵ | Konstantinos Menychtas | 2015-08-11 | 0 | -0/+0 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 05185e0e: am 48812401: am 7f23b1d0: am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp * commit 'c78d07c6e964f23dc12ba739aff49ff1bf74b323': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer | ||||
* | | | | am c2394f9e: (-s ours) am b51fc0b2: Merge "adb tab completion: remove ↵ | Kenny Root | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | extraneous state" * commit 'c2394f9e8e5c8e55f5d171f35709f30c30aa005c': | ||||
| * | | | am b51fc0b2: Merge "adb tab completion: remove extraneous state" | Kenny Root | 2015-07-16 | 1 | -2/+0 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | * commit 'b51fc0b2f99c1bd53c4c9b635d416b76eaa50838': adb tab completion: remove extraneous state | ||||
* | | | | am ff189baa: (-s ours) am 824c4ac7: Merge "Fix build when OUT_DIR is not ↵ | Chris Warrington | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | set." into studio-1.4-dev automerge: ea12935 automerge: eccf248 * commit 'ff189baaf9d35656d3474f4c00a2ae9d0b84e560': | ||||
| * | | | am 824c4ac7: Merge "Fix build when OUT_DIR is not set." into studio-1.4-dev ↵ | Chris Warrington | 2015-07-07 | 1 | -3/+4 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: ea12935 automerge: eccf248 * commit '824c4ac758aaaf0d0939b443a1f3c7def808ca2d': Fix build when OUT_DIR is not set. | ||||
* | | | | | am 24dd4cd7: (-s ours) am b0344cf0: Merge "Supporting path specified by ↵ | Joe Baker-Malone | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | build_tools.sh" into studio-1.4-dev automerge: 6664a90 automerge: 5ffab62 * commit '24dd4cd7d7c527651d1632c2eb08b433bfa34c45': | ||||
| * | | | | am b0344cf0: Merge "Supporting path specified by build_tools.sh" into ↵ | Joe Baker-Malone | 2015-07-07 | 1 | -3/+10 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.4-dev automerge: 6664a90 automerge: 5ffab62 * commit 'b0344cf0ff5f5a29049b20cbdc49664c159ab4d9': Supporting path specified by build_tools.sh | ||||
* | | | | | | am bffde0a6: (-s ours) am 334d9faa: Merge "Proguard: Only keep parcelables ↵ | Chris Warrington | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if they are used." into studio-1.4-dev automerge: 833246f automerge: 014287c * commit 'bffde0a6d2a1fb2969ef85850d53be124a98d064': | ||||
| * | | | | | am 334d9faa: Merge "Proguard: Only keep parcelables if they are used." into ↵ | Chris Warrington | 2015-07-07 | 2 | -4/+4 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.4-dev automerge: 833246f automerge: 014287c * commit '334d9faa135ae4683ba2e4e4c6c53b7b4bcbc74d': Proguard: Only keep parcelables if they are used. | ||||
* | | | | | | | am 83d4b7dd: (-s ours) am 407771dd: Merge "Track lint API change" into ↵ | Tor Norbye | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.4-dev automerge: 131c91c automerge: 3f087d4 * commit '83d4b7ddf1a68c56de62036c475c7a1b08adfab8': | ||||
| * | | | | | | am 407771dd: Merge "Track lint API change" into studio-1.4-dev automerge: ↵ | Tor Norbye | 2015-07-06 | 1 | -1/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 131c91c automerge: 3f087d4 * commit '407771ddea7bf210ca9d1c6f91ea93efdbd6d6cb': Track lint API change | ||||
* | \ \ \ \ \ \ | am c78d07c6: am 61f99f13: am 245b5ea5: am 2af77026: am 67506023: am ↵ | Konstantinos Menychtas | 2015-08-11 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05185e0e: am 48812401: am 7f23b1d0: am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp * commit 'c78d07c6e964f23dc12ba739aff49ff1bf74b323': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer | ||||
| * | | | | | | | am 61f99f13: am 245b5ea5: am 2af77026: am 67506023: am 05185e0e: am ↵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-dev | Konstantinos Menychtas | 2015-08-11 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48812401: am 7f23b1d0: am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp * commit '61f99f13140701092d7b6a49d3d26e454f463d8d': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer | ||||
| | * \ \ \ \ \ \ | am 245b5ea5: am 2af77026: am 67506023: am 05185e0e: am 48812401: am ↵ | Konstantinos Menychtas | 2015-08-11 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7f23b1d0: am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp * commit '245b5ea56cb43b85169caf99fd488b0ac4b27641': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer | ||||
| | | * \ \ \ \ \ \ | am 2af77026: am 67506023: am 05185e0e: am 48812401: am 7f23b1d0: am ↵ | Konstantinos Menychtas | 2015-08-11 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp * commit '2af77026e7d463da075813aed80babb18370d26a': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer | ||||
| | | | * \ \ \ \ \ \ | am 67506023: am 05185e0e: am 48812401: am 7f23b1d0: am a8f117d3: am ↵ | Konstantinos Menychtas | 2015-08-11 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp * commit '6750602374af63f543fa65f2e14b5a8cc318df54': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer | ||||
| | | | | * \ \ \ \ \ \ | am 05185e0e: am 48812401: am 7f23b1d0: am a8f117d3: am 5a571de3: am ↵ | Konstantinos Menychtas | 2015-08-11 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp * commit '05185e0e9d2c5fc6bd381213ddfb374c7583ffb9': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer | ||||
| | | | | | * \ \ \ \ \ \ | am 48812401: am 7f23b1d0: am a8f117d3: am 5a571de3: am 1a30e186: am ↵ | Konstantinos Menychtas | 2015-08-11 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp * commit '48812401e56622fccb2116e381df8e41baaa1400': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer | ||||
| | | | | | | * \ \ \ \ \ \ | am 7f23b1d0: am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved ↵ | Konstantinos Menychtas | 2015-08-11 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflicts for merge of 5830261a to jb-dev-plus-aosp * commit '7f23b1d0dfa045d23b3931a32fd4df2e7f0eef88': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer | ||||
| | | | | | | | * \ \ \ \ \ \ | am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for ↵ | Konstantinos Menychtas | 2015-08-11 | 0 | -0/+0 |
| | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge of 5830261a to jb-dev-plus-aosp * commit 'a8f117d38948aa6fba09e3391fb6afdf16f50b14': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer | ||||
| | | | | | | | | * \ \ \ \ \ \ | am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of ↵ | Konstantinos Menychtas | 2015-08-11 | 0 | -0/+0 |
| | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5830261a to jb-dev-plus-aosp * commit '5a571de39e9d65971fe0eb10aeb7122cd90db72e': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer | ||||
| | | | | | | | | | * \ \ \ \ \ \ | am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to ↵ | Konstantinos Menychtas | 2015-08-11 | 0 | -0/+0 |
| | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev-plus-aosp * commit '1a30e186adf9dfa4b226ee14d58fd09535a98d15': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer | ||||
| | | | | | | | | | | * \ \ \ \ \ \ | am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp | Konstantinos Menychtas | 2015-08-11 | 0 | -0/+0 |
| | | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c8f7ca09183d3a1788df46b2479971f6311ce0d9': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer | ||||
| | | | | | | | | | | | * \ \ \ \ \ \ | resolved conflicts for merge of 5830261a to jb-dev-plus-aosp | Konstantinos Menychtas | 2015-08-09 | 0 | -0/+0 |
| | | | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3b3a1c6dadeaa1afc6423f328b25f13dde196d54 |