aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-10-21Merge "Update catapult and how we update catapult" am: cd89f5ab72 am: 0261a8b2beJohn Reck
am: ffa265f6c9 Change-Id: I052bcbfc1fe4df404bdd2dddc94018842b4a8618
2016-10-21Merge "Update catapult and how we update catapult" am: cd89f5ab72John Reck
am: 0261a8b2be Change-Id: Iaf061da26540fa52e0757069bc0090ab80765a7b
2016-10-21Merge "Update catapult and how we update catapult"android-n-mr2-preview-1John Reck
am: cd89f5ab72 Change-Id: I575a9fffe2bfd11f42ad07b8ee22b3a4f8207026
2016-10-21Merge "Update catapult and how we update catapult"Treehugger Robot
2016-10-20Update catapult and how we update catapultJohn Reck
Test: manual, ran systrace.py Change-Id: Ifda344fd8ff744b8dd0151f748c35c620a628016
2016-10-20Update catapult and how we update catapultJohn Reck
Test: manual, ran systrace.py Change-Id: Id86c732e5de832890429e0bfa5255d09db9841a8
2016-09-30Merge "Fix counter ordering" am: 61575af334 am: ae23987838 am: 8117e1f149Wei Wang
am: 2cbbca1fe7 Change-Id: Ia29bcb7c23a553874512aa41c040b17315e1f6b1
2016-09-30Merge "Fix counter ordering" am: 61575af334 am: ae23987838Wei Wang
am: 8117e1f149 Change-Id: Ie41097e801cdbb938ed4b7da56c66ed787551907
2016-09-30Merge "Fix counter ordering" am: 61575af334Wei Wang
am: ae23987838 Change-Id: I39aedceda3ded5ac263e2e8cb677e9aa51da4db8
2016-09-30Merge "Fix counter ordering"Wei Wang
am: 61575af334 Change-Id: I0fe33f521c733f1300fbd458dd5a7af5ece00a4c
2016-09-30Merge "Fix counter ordering"android-n-mr1-preview-2android-n-mr1-preview-1Treehugger Robot
2016-09-30Fix counter orderingWei Wang
Bug: 31861084 Test: capture a systrace Change-Id: Ia89fe7e74d54c48456d52c6955da695a6f3e4761
2016-09-29Fix counter orderingWei Wang
Test: capture a systrace Change-Id: Ia89fe7e74d54c48456d52c6955da695a6f3e4761
2016-09-19Merge "Update to latest catapult (be85e5fd)" am: 6c00c34066 am: 32fc235614 ↵Chris Craik
am: 45b3f8f282 am: 6546440618 Change-Id: Ib970c77cfed7736d0e5899fcb9601b26e557ad28
2016-09-19Merge "Update to latest catapult (be85e5fd)" am: 6c00c34066 am: 32fc235614Chris Craik
am: 45b3f8f282 Change-Id: Ia3920397a5225b4daa314e2d3be442f64af1cf79
2016-09-19Merge "Update to latest catapult (be85e5fd)" am: 6c00c34066Chris Craik
am: 32fc235614 Change-Id: I2a0eebee67bc457865d4e105c71670093a3b1106
2016-09-19Merge "Update to latest catapult (be85e5fd)"Chris Craik
am: 6c00c34066 Change-Id: I1ced373c87598521866d2dc987ba1585b75c2301
2016-09-19Merge "Update to latest catapult (be85e5fd)"Chris Craik
2016-09-19Update to latest catapult (be85e5fd) am: 7332cdb423 am: 728158224bChris Craik
am: ad09ad0c12 Change-Id: Ied00bbf3350e73fe984920b78d7229256da84837
2016-09-19Update to latest catapult (be85e5fd) am: 7332cdb423Chris Craik
am: 728158224b Change-Id: I24e3c4dfebf1d207459501760bba899cbc4027e6
2016-09-19Update to latest catapult (be85e5fd)android-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_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devChris Craik
am: 7332cdb423 Change-Id: Icfcbfa93ef52e2a62a291cbd39ba37f381d4c21d
2016-09-19Update to latest catapult (be85e5fd)Chris Craik
bug:31252260 bug:31335915 bug:31340203 Test: ./catapult/systrace/bin/run_tests - systrace tests pass Change-Id: I844b83711c56f3ea8a6d0bf254a1187b62c33f81
2016-09-16Update to latest catapult (be85e5fd)android-cts_7.1_r1android-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-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_r1nougat-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-releaseChris Craik
bug:31335915 bug:31340203 bug:31551133 Change-Id: I844b83711c56f3ea8a6d0bf254a1187b62c33f81
2016-08-23Merge "Prune old pyc files" am: 69fd07151d am: 3bdd2133df am: f132abf4ffChris Craik
am: 4fdefac9b2 Change-Id: I4a343e34b192e80c565ef883aedc60fcbcf1e2ac
2016-08-23Prune old pyc files am: b1cc17c51c am: 2e44c74d32John Reck
am: 0b63bd97ed Change-Id: I4f209cab9b25932c744855bc9bd2d85e3d750320
2016-08-23Merge "Prune old pyc files" am: 69fd07151d am: 3bdd2133dfChris Craik
am: f132abf4ff Change-Id: I94025981a33d1f52343f9eb4196ff6850883787b
2016-08-23Merge "Prune old pyc files" am: 69fd07151dChris Craik
am: 3bdd2133df Change-Id: I41ff67d87e598e08d4f78231200758a359f66c2c
2016-08-23Merge "Prune old pyc files"Chris Craik
am: 69fd07151d Change-Id: I3d5cd9d9e3156c346a7dcc1c6f7606e03822df1a
2016-08-23Prune old pyc files am: b1cc17c51cJohn Reck
am: 2e44c74d32 Change-Id: If01357ed60ce2e67bf0e2a827eade3d400ec509d
2016-08-23Prune old pyc filesJohn Reck
am: b1cc17c51c Change-Id: Iaafdbf42255227164bdd9d6cde8e225b65204037
2016-08-23Merge "Prune old pyc files"Chris Craik
2016-08-23Prune old pyc filesJohn Reck
Bug: 31038810 Change-Id: I800eaeae0b7c233d7dcabdbd2479bfb0132eb4ae
2016-08-23Prune old pyc filesJohn Reck
Bug: 31038810 Change-Id: I800eaeae0b7c233d7dcabdbd2479bfb0132eb4ae
2016-08-22Update to latest catapult (1ff7619f) am: 47f0f1e200 am: c526523aa7Chris Craik
am: d671d0289c Change-Id: Ib3806e4fce08b22628971c18136be39b131752ba
2016-08-22Update to latest catapult (1ff7619f) am: 47f0f1e200Chris Craik
am: c526523aa7 Change-Id: Iefc6feb13e70e264404d5d7d177a216749b96336
2016-08-22Update to latest catapult (1ff7619f)Chris Craik
am: 47f0f1e200 Change-Id: I5e1eca1bafc4dcb0191575c8c4d119151f218a24
2016-08-22Merge "Update to latest catapult (1ff7619f)" am: 3b9f71c9a6 am: 1f4523cb80 ↵Chris Craik
am: e91d007ca0 am: b1f55d7789 Change-Id: I95810035903f64e671f814240aa99520290fd194
2016-08-22Merge "Update to latest catapult (1ff7619f)" am: 3b9f71c9a6 am: 1f4523cb80Chris Craik
am: e91d007ca0 Change-Id: Ie52582381c9c06a615a68b57f683a4d038f437d5
2016-08-22Merge "Update to latest catapult (1ff7619f)" am: 3b9f71c9a6Chris Craik
am: 1f4523cb80 Change-Id: I13c1a562855e3d1b0ce1057020363d4e1f36769b
2016-08-22Merge "Update to latest catapult (1ff7619f)"Chris Craik
am: 3b9f71c9a6 Change-Id: Ie503e966f07a3781c18cdf4a47ef391bb3c7e24c
2016-08-22Merge "Update to latest catapult (1ff7619f)"Chris Craik
2016-08-22Update to latest catapult (1ff7619f)Chris Craik
bug:21925298 bug:29643805 bug:30299278 bug:30397774 bug:30953297 Change-Id: I4d73c3c5454541a50703253ebeb63e5b2ea01fec
2016-08-19Update to latest catapult (1ff7619f)Chris Craik
bug:21925298 bug:29643805 bug:30299278 bug:30397774 bug:30953297 Change-Id: I4d73c3c5454541a50703253ebeb63e5b2ea01fec
2016-03-31Merge "Update to latest catapult (e5abb7bd)" am: cf3bd4e am: 08a35dfChris Craik
am: 3a6ada9 * commit '3a6ada9f96fdbe98ddb52a8fcf9e20866c03bb42': Update to latest catapult (e5abb7bd) Change-Id: I7b27b5eb94c0bbdc1d61668169b8eb2a89969a91
2016-03-31Merge "Update to latest catapult (e5abb7bd)" am: cf3bd4eChris Craik
am: 08a35df * commit '08a35df62811abbff89ca239f64e25add5777838': Update to latest catapult (e5abb7bd) Change-Id: I4b68f06bad6e920991da8832a75324f5c502aa3c
2016-03-31Update to latest catapult (e5abb7bd) am: cef7893Chris Craik
am: 14d1370 * commit '14d1370697789a497938dde18720f8ca6422e9e3': Update to latest catapult (e5abb7bd) Change-Id: Ifb938d3fd538bac05d1cd0ec5f069eb3c497a0e8
2016-03-31Merge "Update to latest catapult (e5abb7bd)"Chris Craik
am: cf3bd4e * commit 'cf3bd4e119057b93aabc136f2a2f3199aa24f1ad': Update to latest catapult (e5abb7bd) Change-Id: I043777fa719df29dae9cb112c5a8a319f05c229a
2016-03-31Update to latest catapult (e5abb7bd)Chris Craik
am: cef7893 * commit 'cef7893435aa41160dd1255c43cb8498279738cc': Update to latest catapult (e5abb7bd) Change-Id: Icaccb98ab56a209b502a9232080f74c1fac4be4a
2016-03-31Merge "Update to latest catapult (e5abb7bd)"android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Chris Craik
2016-03-31Update to latest catapult (e5abb7bd)Chris Craik
Change-Id: Ic610f2da8ecd564d5dd58cbc8b9a738ee74b2a06