tree 2bd9f680ce7910fd9639c4366fac265578f3b809
parent 4138e1c8c37bb64382eb4cdcaba7634acf8a66aa
parent 03621cea0e8c8015d52d8c94dd4c417139d1b7fb
author Lalit Maganti <lalitm@google.com> 1519995398 +0000
committer android-build-merger <android-build-merger@google.com> 1519995398 +0000

Merge "perfetto: rework watchdog class to cope with monitoring CPU and memory" am: 8ee9f26649 am: 6a1e7c34dc
am: 03621cea0e

Change-Id: Ie54d5a971a7e8d1d807e145b099e73fb10664780