aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-04-04merge in nyc-release history after reset to nyc-devandroid-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.0.0_r9android-7.0.0_r8android-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_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr0.5-releasenougat-cts-releasenougat-bugfix-releaseThe Android Automerger
2016-04-04merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-03-28Update to latest catapult (e5abb7bd)android-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_r1nougat-dr1-releasenougat-devChris Craik
2016-03-02Fix binder lock parsing.Martijn Coenen
2015-12-03Merge "Merge from Catapult Tot"android-n-preview-1Ruchi Kandoi
2015-12-03Merge from Catapult TotRuchi Kandoi
2015-09-22am 824ce195: am 98ccdc77: Merge "Update to catapult ToT."Martijn Coenen
2015-09-22am 98ccdc77: Merge "Update to catapult ToT."Martijn Coenen
2015-09-22Merge "Update to catapult ToT."Martijn Coenen
2015-09-18Update to catapult ToT.Martijn Coenen
2015-09-02am b2331bc7: am 99b3089d: Merge "Update after moving the code to Catapult"Chris Craik
2015-09-02am 99b3089d: Merge "Update after moving the code to Catapult"Chris Craik
2015-09-02Merge "Update after moving the code to Catapult"Chris Craik
2015-08-28Update after moving the code to CatapultZhen Wang
2015-08-27am 1c4e01bd: (-s ours) am ee56b2f0: Merge "Fix systrace unittests before movi...Chris Craik
2015-08-27am 9c34c873: (-s ours) resolved conflicts for merge of 0277072f to mnc-dev-pl...John Reck
2015-08-27am f66cc6a3: (-s ours) am 5a59c213: Merge "Double the default buffer size if ...John Reck
2015-08-27am fb0318d2: (-s ours) am ca4ce61e: Merge "Update to latest catapult"John Reck
2015-08-27am f6d1f6b7: (-s ours) am a7946b36: Merge "Upgrade to new import methods."Chris Craik
2015-08-27am c590b688: (-s ours) am 7f57422d: Merge "Update to catapult ToT for tracing."Chris Craik
2015-08-27am 327feb1c: (-s ours) am 101156fa: Merge "Upgrade update.py to catapult repo...Chris Craik
2015-08-27am 80b0e9c8: (-s ours) am d09b4de6: Merge "Changed how pre processing command...Riley Andrews
2015-08-27am 5e43ab46: (-s ours) am d60502be: Merge "Enable Systrace to be used during ...Yasuhiro Matsuda
2015-08-27am f44e252f: (-s ours) am b2cbf159: Update to latest trace-viewer (a7f1c1b3)Chris Craik
2015-08-27am bc259bd7: (-s ours) am 71c9a1bd: Merge "Update to latest trace-viewer (a7f...Chris Craik
2015-08-27am 069ead24: (-s ours) am 25c561df: Merge "add unit test for --from-file option"Chris Craik
2015-08-27am 063268b9: (-s ours) am ad0b04f5: Sync to latest from aosp masterChris Craik
2015-08-24am ee56b2f0: Merge "Fix systrace unittests before moving to Catapult"Chris Craik
2015-08-24am ee56b2f0: Merge "Fix systrace unittests before moving to Catapult"Chris Craik
2015-08-24Merge "Fix systrace unittests before moving to Catapult"Chris Craik
2015-08-22Fix systrace unittests before moving to CatapultZhen Wang
2015-08-20resolved conflicts for merge of 0277072f to mnc-dr-dev-plus-aospJohn Reck
2015-08-20resolved conflicts for merge of 0277072f to mnc-dev-plus-aospJohn Reck
2015-08-20am 5a59c213: Merge "Double the default buffer size if sched is set"John Reck
2015-08-20am 5a59c213: Merge "Double the default buffer size if sched is set"John Reck
2015-08-20Merge "Double the default buffer size if sched is set"John Reck
2015-08-20am ca4ce61e: Merge "Update to latest catapult"John Reck
2015-08-20am ca4ce61e: Merge "Update to latest catapult"John Reck
2015-08-20Merge "Update to latest catapult"John Reck
2015-08-20Double the default buffer size if sched is setJohn Reck
2015-08-20Update to latest catapultJohn Reck
2015-08-20Add 'n' and 'p' to the regexp for the need-resched bit.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-devBen Cheng
2015-08-19am a7946b36: Merge "Upgrade to new import methods."Chris Craik
2015-08-19am a7946b36: Merge "Upgrade to new import methods."Chris Craik
2015-08-19Merge "Upgrade to new import methods."Chris Craik
2015-08-19Upgrade to new import methods.Dan Sinclair
2015-08-18am 7f57422d: Merge "Update to catapult ToT for tracing."Chris Craik
2015-08-18am 101156fa: Merge "Upgrade update.py to catapult repo changes"Chris Craik
2015-08-18am 7f57422d: Merge "Update to catapult ToT for tracing."Chris Craik
2015-08-18am 101156fa: Merge "Upgrade update.py to catapult repo changes"Chris Craik