aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-04-03Merge master@5406228 into git_qt-dev-plus-aosp.android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseBill Rassieur
2019-03-29Merge master@5406228 into git_qt-dev-plus-aosp.Bill Rassieur
2019-03-26Merge "Small updates to OkHttp-Conscrypt interaction" am: 8df04b2342 am: aff5...Adam Vartanian
2019-03-26Merge "Small updates to OkHttp-Conscrypt interaction" am: 8df04b2342Adam Vartanian
2019-03-26Merge "Small updates to OkHttp-Conscrypt interaction"Adam Vartanian
2019-03-26Merge "Small updates to OkHttp-Conscrypt interaction"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5Treehugger Robot
2019-03-26Small updates to OkHttp-Conscrypt interactionAdam Vartanian
2019-03-22Merge "Use public API for Conscrypt features" am: daf92ccb09 am: d980250445Adam Vartanian
2019-03-22Merge "Use public API for Conscrypt features" am: daf92ccb09Adam Vartanian
2019-03-22Merge "Use public API for Conscrypt features"Adam Vartanian
2019-03-22Merge "Use public API for Conscrypt features"Treehugger Robot
2019-03-22Use public API for Conscrypt featuresAdam Vartanian
2019-03-14Merge "Use tools/currysrc/scripts/repackage-common.sh" am: 6858021441 am: 926...Paul Duffin
2019-03-14Merge "Use tools/currysrc/scripts/repackage-common.sh" am: 6858021441Paul Duffin
2019-03-14Merge "Use tools/currysrc/scripts/repackage-common.sh"Paul Duffin
2019-03-14Merge "Use tools/currysrc/scripts/repackage-common.sh"Treehugger Robot
2019-03-14Use tools/currysrc/scripts/repackage-common.shPaul Duffin
2019-03-01Merge "Relax test constraint for disconnected HttpURLConnection." am: 26c472f...Pete Bentley
2019-03-01Merge "Relax test constraint for disconnected HttpURLConnection." am: 26c472ffe3Pete Bentley
2019-03-01Merge "Relax test constraint for disconnected HttpURLConnection."Pete Bentley
2019-03-01Merge "Relax test constraint for disconnected HttpURLConnection."android-q-preview-1android-o-mr1-iot-release-1.0.10Treehugger Robot
2019-03-01Relax test constraint for disconnected HttpURLConnection.Pete Bentley
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
2018-12-12Merge "Add hiddenapi entries from bugbot scrape of bug reports" am: 47167645e...Paul Duffin
2018-12-12Merge "Add hiddenapi entries from bugbot scrape of bug reports" am: 47167645e9Paul Duffin
2018-12-12Merge "Add hiddenapi entries from bugbot scrape of bug reports"Paul Duffin
2018-12-12Merge "Add hiddenapi entries from bugbot scrape of bug reports"android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Paul Duffin
2018-12-12Add hiddenapi entries from bugbot scrape of bug reportsPaul Duffin
2018-12-04Merge "Keep dex files in okhttp-testdex.jar." am: 188a8a2e72 am: 1044f7327cVladimir Marko
2018-12-04Merge "Keep dex files in okhttp-testdex.jar." am: 188a8a2e72Vladimir Marko
2018-12-04Merge "Keep dex files in okhttp-testdex.jar."Vladimir Marko
2018-12-04Merge "Keep dex files in okhttp-testdex.jar."android-wear-8.0.0_r2Vladimir Marko
2018-12-04Keep dex files in okhttp-testdex.jar.Vladimir Marko
2018-11-27Merge "Annotate repackaged API with @UnsupportedAppUsage" am: d7dcb74c08 am: ...Paul Duffin
2018-11-27Merge "Annotate repackaged API with @UnsupportedAppUsage" am: d7dcb74c08Paul Duffin
2018-11-27Merge "Annotate repackaged API with @UnsupportedAppUsage"Paul Duffin
2018-11-27Merge "Annotate repackaged API with @UnsupportedAppUsage"android-n-iot-release-ihome-igv1nougat-iot-releaseTreehugger Robot
2018-11-27Annotate repackaged API with @UnsupportedAppUsagePaul Duffin
2018-11-23Merge "Add missing default constructors (part 2)" am: 0fe8114680 am: 563f9f015fPaul Duffin
2018-11-23Merge "Add missing default constructors (part 2)" am: 0fe8114680Paul Duffin
2018-11-23Merge "Add missing default constructors (part 2)"Paul Duffin
2018-11-23Merge "Add missing default constructors (part 2)"Treehugger Robot
2018-11-23Add missing default constructors (part 2)Paul Duffin
2018-11-22Merge "Add missing default constructors" am: 4dfe720e5a am: d7302d7e14Paul Duffin
2018-11-22Merge "Add missing default constructors" am: 4dfe720e5aPaul Duffin
2018-11-22Merge "Add missing default constructors"Paul Duffin
2018-11-22Merge "Add missing default constructors"Treehugger Robot
2018-11-22Add missing default constructorsPaul Duffin
2018-11-19Merge "Use generated source not jarjar" am: fbdaa4eb83 am: 90376343f2Paul Duffin