summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Snap for 6844436 from 1bd4a99739f855ede7d1ad035c725d3d187e2db0 to simpleperf-...simpleperf-releaseandroid-build-prod (mdb)2020-09-175-13/+34
|\
| * Merge Android RHEADmasterXin Li2020-09-085-13/+34
| |\
| | * Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-275-13/+34
| |/|
| | * Add error resolution for missing permission am: e7cb020b5dSimon Dai2020-04-245-13/+34
| | |\
| | | * Add error resolution for missing permissionandroid11-devSimon Dai2020-04-235-13/+34
| | * | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| | |\ \ | | |/ / | |/| |
| | * | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901...Xin Li2020-03-190-0/+0
| | |\ \
| | * \ \ [automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am...Automerger Merge Worker2020-03-060-0/+0
| | |\ \ \ | | | |_|/ | | |/| |
| | * | | [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendo...Automerger Merge Worker2020-01-160-0/+0
| | |\ \ \
| | * \ \ \ Set active queue item id when paused am: 6e803c745f am: ea0b382d26 am: 2fdad6...Automerger Merge Worker2020-01-021-0/+1
| | |\ \ \ \
| | * \ \ \ \ [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...Xin Li2019-10-300-0/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ [automerger skipped] Merge Coral/Flame into AOSP master am: 03caa15dc3 -s our...Xin Li2019-10-260-0/+0
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Skip QD1A.190821.011 in stage-aosp-master am: 732595c5d5 am: 3bdfd90617Xin Li2019-10-180-0/+0
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-110-0/+0
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 9dc8c8eb...Xin Li2019-09-050-0/+0
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Fix a crash when equals() is called on null String am: 384d0e331f am: 831fb52...Yabin Huang2019-07-310-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Fix a crash when equals() is called on null String am: 384d0e331f am: 831fb52...Yabin Huang2019-07-310-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Fix a crash when equals() is called on null String am: 384d0e331f am: 831fb52...Yabin Huang2019-07-311-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (56...Xin Li2019-07-020-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-mast...Xin Li2019-04-090-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Add default code reviewers into OWNERS am: 3cad4d584d am: fd7e0ec82fChih-Hung Hsieh2019-04-081-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolve merge conflicts of c178021c320a49a2690403d3fca3c213294b27a6 to qt-dev...Sasha Smundak2019-04-042-63/+56
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE am: b6d4a69ae9 -s ours am: c02dfb67f9 -s oursXin Li2019-04-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge Android Pie into master am: f2e1d21306 am: 370c3703ef am: e53cd14670Xin Li2019-04-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge Android Pie into master am: f2e1d21306 am: 370c3703efXin Li2019-04-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | Snap for 6577974 from 7ec358cab4e626301e2a9366a713f480c9f76bb0 to simpleperf-...android-build-prod (mdb)2020-06-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterandroid-r-beta-3android-r-beta-2Xin Li2020-04-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-maste...Xin Li2020-03-190-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li2020-03-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 2c0d6f6e66 am: 3530...Automerger Merge Worker2020-03-060-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 2c0d6f6e66Automerger Merge Worker2020-03-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stag...Automerger Merge Worker2020-01-160-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Snap for 6317425 from 2c0d6f6e6615cffd5a386e04929de9433bb4ab8e to simpleperf-...android-build-prod (mdb)2020-03-201-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge stage-aosp-master to aosp-master - DO NOT MERGEandroid-r-preview-4android-r-preview-3android-r-preview-2Bill Yi2020-03-051-0/+1
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stag...android10-sidebranchXin Li2020-01-151-0/+1
| |/| | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Set active queue item id when paused am: 6e803c745f am: ea0b382d26 am: 2fdad6...Automerger Merge Worker2020-01-021-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Set active queue item id when paused am: 6e803c745f am: ea0b382d26 am: 2fdad6...android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android10-qpr3-s1-releaseandroid10-qpr3-releaseAutomerger Merge Worker2020-01-021-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Set active queue item id when paused am: 6e803c745f am: ea0b382d26Automerger Merge Worker2020-01-021-0/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Set active queue item id when paused am: 6e803c745fAutomerger Merge Worker2020-01-021-0/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | Set active queue item id when pausedYabin Huang2019-12-201-0/+1
| | * | | | | | | | | | | | | | | | | | | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li2019-10-300-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | [automerger skipped] Merge Coral/Flame into AOSP master am: 03caa15dc3 -s our...Xin Li2019-10-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | [automerger skipped] Merge Coral/Flame into AOSP master am: 03caa15dc3 -s oursXin Li2019-10-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | Skip QD1A.190821.011 in stage-aosp-master am: 732595c5d5Xin Li2019-10-180-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Skip QD1A.190821.011 in stage-aosp-masterXin Li2019-10-180-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | Snap for 6079754 from 5d49ef72dc25db83ad4bc345c791694ee11ed4e0 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
| |\| | | | | | | | | | | | | | | | | | | | | | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-110-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 9dc8c8eb...Xin Li2019-09-050-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |