aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-05-12Merge "Add dependency on new location of pyserial"android-o-preview-3android-n-iot-preview-4n-iot-preview-4Chris Craik
2017-05-12Add dependency on new location of pyserialChris Craik
Test: ran ./update.py, which completed successfully Change-Id: I7cc377340b490baf33ebae8705c5163e56e76f9d
2017-04-04Update to latest catapult (c69b7871) am: a0e5c0de42Chris Craik
am: 2e652b406b Change-Id: I94a0aa38548b7ad2676665e5d4a67e64502d371c
2017-04-04Update to latest catapult (c69b7871)Chris Craik
am: a0e5c0de42 Change-Id: Ibc9f70c393db3f3e11a21f44888de7f03301cb90
2017-04-03Update to latest catapult (c69b7871)android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-releaseChris Craik
Bug:21565824 Bug:34394562 Bug:36573168 Test: ./systrace.py Notable changes: - Freq tracing on by default - Binder driver tracing on by default - Renderscript tracing on by default (on M+ devices) - UI thread ordering fixed - Async sections no longer shown twice Change-Id: I83e4b2a3964aa8898e638def81fbe3603e2a51cc
2017-04-03resolve merge conflicts of 9ede47ea to oc-dev-plus-aospChris Craik
am: c088b23ae5 Change-Id: I1ea3224c203fd8aae51e7c56a46c0701d32e6cb3
2017-04-03resolve merge conflicts of 9ede47ea to oc-dev-plus-aospChris Craik
Test: external/chromium-trace/systrace.py Change-Id: I06f10b563d774ebcd6ebee75eb3622d0d71795c2
2017-04-03Merge "Update to latest catapult (c69b7871)" am: cd2d4f530aChris Craik
am: 97b70dcd33 Change-Id: I5dd41da7ae734e41e80f4366977a466e8117884d
2017-04-03Merge "Update to latest catapult (c69b7871)"android-wear-o-preview-4android-wear-o-preview-3android-o-preview-2Chris Craik
am: cd2d4f530a Change-Id: If7ca251619faa34d8bd907f924cc5935e7f61012
2017-04-03Merge "Update to latest catapult (c69b7871)"Chris Craik
2017-03-29Update to latest catapult (c69b7871)Chris Craik
Bug:21565824 Bug:34394562 Bug:36573168 Test: ./systrace.py Notable changes: - Freq tracing on by default - Binder driver tracing on by default - Renderscript tracing on by default (on M+ devices) - UI thread ordering fixed - Async sections no longer shown twice Change-Id: I83e4b2a3964aa8898e638def81fbe3603e2a51cc
2017-03-13Merge "Sync to internal master" am: 6f2b0c6d0b am: 709e152c8eChris Craik
am: 5846163f55 -s ours Change-Id: I0d6f6a26cdae36bcc73da428dbae698965756049
2017-03-13Merge "Include telemetry in packaging" am: f352ddd9ba -s ours am: 6bbe1323abJohn Reck
am: d43ec465b5 Change-Id: I9c84259c04814df3683b5686ae59eff7ebc7413b
2017-03-13Merge "Sync to internal master" am: 6f2b0c6d0bChris Craik
am: 709e152c8e Change-Id: I9e817a4f455a40a9b85ef493ac5638f8d6c2e87b
2017-03-13Merge "Include telemetry in packaging" am: f352ddd9ba -s oursJohn Reck
am: 6bbe1323ab Change-Id: Ibeb6a5f3ed47305b3385b1d5c44f4c4333307b92
2017-03-13Merge "Sync to internal master"Chris Craik
am: 6f2b0c6d0b Change-Id: I5368e0a68e271dac158c9ff4cb8eba10c5b1c902
2017-03-13Merge "Include telemetry in packaging"John Reck
am: f352ddd9ba -s ours Change-Id: I45dca1952d75c2519b49ee384b8d7dbc84b6552e
2017-03-13Merge "Sync to internal master"android-n-mr2-preview-2Chris Craik
2017-03-13Merge "Include telemetry in packaging"Treehugger Robot
2017-03-13Sync to internal masterChris Craik
Syncs to upstream revision e2a178a9c0cdc4e6aa745af113bc9b7ae3651aa8 via update.py --local=<internal-path> Test: ran systrace.py locally Change-Id: Ieb2b634438a4e408b46d2fb9621ed19d65520cf4
2017-03-13Include telemetry in packagingJohn Reck
Bug: 34225046 telemetry/third_party/pyserial contains the wrapper scripts necessary for the import serial to work on MacOS Test: run update.py && systrace.py on mac Change-Id: I120e39022fc36cf2dab7084fc398ebc779249d51
2017-02-22Merge "Do not check in upstream OWNERS files"TreeHugger Robot
2017-02-22Do not check in upstream OWNERS filesChris Craik
Bug: 33166666 Bug: 35635929 Test: update.py --local=catapult-local Change-Id: I4f16655a2a634b0526417fdaaba6641d9564332f Manual cherry-pick of 4da9498423988e795cee12789baf39f3f80fd4d3 from aosp master.
2017-02-22Merge "Do not check in upstream OWNERS files DO NOT MERGE" am: e997428cc0 ↵Chris Craik
-s ours am: 0e6182ec9a -s ours am: e75686b1cb -s ours Change-Id: I5995f4e854625ffb24235154c0831e0751a5042e
2017-02-22Merge "Do not check in upstream OWNERS files DO NOT MERGE" am: e997428cc0 ↵Chris Craik
-s ours am: 0e6182ec9a -s ours Change-Id: If2e58f54289f1fed26de84582d085846e4f1d2bb
2017-02-22Merge "Do not check in upstream OWNERS files DO NOT MERGE"Chris Craik
am: e997428cc0 -s ours Change-Id: I44cf85cd0333a0bb646debbd2f6602f85cb0c07d
2017-02-22Merge "Do not check in upstream OWNERS files DO NOT MERGE"android-o-preview-1o-previewChris Craik
2017-02-22Do not check in upstream OWNERS files DO NOT MERGEChris Craik
Bug: 33166666 Bug: 35635929 Test: update.py --local=catapult-local Change-Id: I4f16655a2a634b0526417fdaaba6641d9564332f
2017-01-19Cherry pick thread name fixJohn Reck
Upstream CL: https://codereview.chromium.org/2641223002/ Test: Manual, verified thread names are showing up Change-Id: I8e9d3ca601b93cb33d1ac947e1a0c6292f998873
2017-01-18Update catapultJohn Reck
Change-Id: I910174f04ddd7be9b607f4a2a60c88e0b8bfcf20 Fixes: 34127555 Fixes: 34225046 Test: Ran systrace, viewed result
2017-01-18Include telemetry in packagingJohn Reck
Bug: 34225046 telemetry/third_party/pyserial contains the wrapper scripts necessary for the import serial to work on MacOS Test: run update.py && systrace.py on mac Change-Id: I120e39022fc36cf2dab7084fc398ebc779249d51
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 13:39:28 +0000