tree ee7a4abf4c5738fa4276ade3e0a56cd35270c7f7
parent d3c96f87493027c19f5bc1f8dc3a526a999ad261
parent 64114ddf2ef05ebf6f571851e833fe5594899e31
author Yabin Cui <yabinc@google.com> 1485196044 +0000
committer android-build-merger <android-build-merger@google.com> 1485196044 +0000

Merge "simpleperf: profile non-debuggable apps on rooted devices." am: d69dc72924
am: 64114ddf2e

Change-Id: I9b0e320c594b27e593f8335eb413f6e996191c61