tree 19e759e57060230dc79eced0fb5f477c6f5ed7c9
parent c469505e8a92b41d18d91b89eb9e96f1f9a30cec
parent 2fae223cc63c2210f7743f95d3252db45f6536bc
author Chris Craik <ccraik@google.com> 1474306780 +0000
committer android-build-merger <android-build-merger@google.com> 1474306780 +0000

Merge "Support new Systrace dependencies" into nyc-mr1-dev
am: 2fae223cc6

Change-Id: Ie995b1a8f011c8b7dd95db95b2bae7c9846ada4b