[roll] Roll fuchsia [perf, power] Support merging power data into traces.

Add merge_power_data() method to PowerSampler.

Original-Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1008294
Original-Revision: cf150ad1545300ba1eca3ba43b664c44cc3bfaaa
GitOrigin-RevId: ed05d0200f82476dbd6557f662062a9730c6bf49
Change-Id: Ief999084aa7c828ddf657b816bd736cc91977757
1 file changed
tree: 41301e139798335bf3e798c714e657f64132036f
  1. ctf/
  2. git-hooks/
  3. infra/
  4. third_party/
  5. cts
  6. firmware
  7. flower
  8. jiri.lock
  9. MILESTONE
  10. minimal
  11. prebuilts
  12. README.md
  13. stem
  14. test_durations
  15. toolchain
README.md

Integration

This repository contains Fuchsia's Global Integration manifest files.

Making changes

All changes should be made to the internal version of this repository. Our infrastructure automatically updates this version when the internal one changes.

Currently all changes must be made by a Google employee. Non-Google employees wishing to make a change can ask for assistance via the IRC channel #fuchsia on Freenode.

Obtaining the source

First install Jiri.

Next run:

$ jiri init
$ jiri import minimal https://fuchsia.googlesource.com/integration
$ jiri update

Third party

Third party projects should have their own subdirectory in ./third_party.