tree 55e37ec9ed751703a3d640c698da9bfa08f26e0e
parent bf346df6e80e74ac877af7493b65a21faae5835f
parent 693e05d21ae6999a8ebfe149eaaa07366d69396a
author Florian Mayer <fmayer@google.com> 1528217290 -0700
committer android-build-merger <android-build-merger@google.com> 1528217290 -0700

Merge "Allow access to tracing/per_cpu/cpu?/trace files." am: 978e43d7a1
am: 693e05d21a

Change-Id: I82a74f322c38716f4ec1b14ed982f6a636edf051