summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Snap for 6844436 from 2a43041b3a0c8d1029a5ee1ee2386f9e5dc79ff2 to simpleperf-...simpleperf-releaseandroid-build-prod (mdb)2020-09-170-0/+0
|\
| * Remove MODULE_LICENSE_APACHE2 from mulidex am: 1ddcf81084 am: 70cd958708HEADmasterBob Badour2020-05-051-0/+0
| |\
| * \ [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...android-mainline-11.0.0_r1android11-mainline-releaseandroid11-devXin Li2019-10-300-0/+0
| |\ \
| * \ \ Merge "Force re-extraction if dex number is invalid" am: 6944597270 am: 92d83...Jon Noack2019-09-101-1/+6
| |\ \ \
| * \ \ \ [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
| |\ \ \ \
| * \ \ \ \ [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ca61a626...Xin Li2019-09-050-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (56...Xin Li2019-07-020-0/+0
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Snap for 6577974 from 70cd958708d114be38febd015485f582f1165bee to simpleperf-...android-build-prod (mdb)2020-06-101-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Remove MODULE_LICENSE_APACHE2 from mulidex am: 1ddcf81084android-r-beta-3android-r-beta-2Bob Badour2020-05-051-0/+0
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Remove MODULE_LICENSE_APACHE2 from mulidexBob Badour2020-04-271-0/+0
| |/ / / / / /
* | | | | | | Snap for 6317425 from 85015412f25c08bb7adfe12050f742f344b1ada2 to simpleperf-...android-build-prod (mdb)2020-03-200-0/+0
|\| | | | | |
| * | | | | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...android-r-preview-4android-r-preview-3android-r-preview-2Xin Li2019-10-300-0/+0
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
* | | | | | | Snap for 6079754 from fa83e46b7608229c746384c377655929464c56e0 to simpleperf-...android-build-prod (mdb)2019-12-170-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...android-r-preview-1Xin Li2019-10-300-0/+0
| |\| | | | |
| | * | | | | Merge "Force re-extraction if dex number is invalid" am: 6944597270 am: 92d83...Jon Noack2019-09-101-1/+6
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Merge "Force re-extraction if dex number is invalid" am: 6944597270Jon Noack2019-09-101-1/+6
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
| | |\| | | | | | | |_|_|/ | | |/| | |
| | | * | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
| | | |\ \ \
| | * | | | | [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ca61a626...Xin Li2019-09-050-0/+0
| | |\| | | | | | | |_|_|/ | | |/| | |
| | | * | | [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ca61a626...Xin Li2019-09-050-0/+0
| | |/| | |
| | | * | | [automerger skipped] DO NOT MERGE - Merge Android 10 into masterXin Li2019-09-050-0/+0
| | | |\ \ \
* | | | | | | Snap for 5991463 from 92d835c69ab9f8def1671adcb6611fecdd3242d2 to simpleperf-...android-build-prod (mdb)2019-11-060-0/+0
|\| | | | | |
| * | | | | | Merge "Force re-extraction if dex number is invalid"Jon Noack2019-09-101-1/+6
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li2019-09-080-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | / / | | |_|_|/ / | |/| | | |
| | * | | | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aos...Xin Li2019-07-020-0/+0
| | |\ \ \ \ | | | | |/ / | | | |/| / | | | |_|/ | | |/| |
* | | | | Snap for 5933730 from 69445972703ba195cc120e1c4daf4fab3f40f000 to simpleperf-...android-build-prod (mdb)2019-10-118-31/+43
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge "Force re-extraction if dex number is invalid"ndk-sysroot-r21Treehugger Robot2019-09-101-1/+6
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Force re-extraction if dex number is invalidJon Noack2019-09-061-1/+6
| * | | | DO NOT MERGE - Merge Android 10 into masterXin Li2019-09-047-30/+37
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aos...Xin Li2019-07-017-30/+37
| |/| | | | |/
| | * Merge stage-aosp-master into pi-dev-plus-aospandroid-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-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-releaseXin Li2019-02-250-0/+0
| | |\
| | | * Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| | | |\ | | |_|/ | |/| |
| | * | Remove empty Android.mk file am: ab3fe997f4 am: 615d329223Sasha Smundak2019-01-291-19/+0
| | |\|
| | | * Remove empty Android.mk file am: ab3fe997f4Sasha Smundak2019-01-281-19/+0
| | | |\
| | * | | Do not use regexps to parse simple version strings. am: 44d3900a5d am: 1d9ec3...Mads Ager2018-11-272-7/+8
| | |\| |
| | * | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE...Bill Yi2018-10-240-0/+0
| | |\ \ \
| | * \ \ \ [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ...Bill Yi2018-10-240-0/+0
| | |\ \ \ \
| | * \ \ \ \ Merge "Fix compatibility with Robolectric." am: 8845f3212e am: 5255f14314Brett Chabot2018-10-192-21/+39
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge Android Pie into master am: eb24b3049f am: e3c17ce4b0 am: c358e4589fXin Li2018-08-080-0/+0
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge "Fix ub-multidex gradle build, add docs"Alan Viverette2018-08-017-31/+38
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix ub-multidex gradle build, add docsAlan Viverette2018-07-207-31/+38
| | * | | | | | | | Merge "Update OWNERS in frameworks/multidex." am: 0572c7e8a9 am: 0a66748ecf a...Mads Ager2018-07-241-4/+3
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Fix the broken build: git_master/apps am: edc9c8d3e1 am: f087e881a1 am: 8bccb...Nan Zhang2018-07-232-0/+12
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Convert android-support-multidex-(instrumentation) to Soong am: 2121bfabfe am...Nan Zhang2018-07-234-69/+82
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: a4c2eaf8bcXin Li2018-06-090-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ multidex: Update path to android.jar. am: 232a4df4d5 am: 20a0918419Anton Hansson2018-05-021-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Migrate multidex to androidx am: 475db10611Alan Viverette2018-03-1312-13/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | Snap for 5590161 from 0af363100de92b20cbcdb19c17db2eec416a9a2e to simpleperf-...android-build-prod (mdb)2019-05-210-0/+0
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li2019-02-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Do not use regexps to parse simple version strings. am: 44d3900a5dMads Ager2018-11-272-7/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |