tree 076e4dfa95a812f74c41e4cae8dffd95282df6d7
parent 218c1b4255b89fcac1091973b7e8d5dfafecc98d
parent 0d4b0a82c5f4a1a439056adeeede5c378e8a4f16
author Yabin Cui <yabinc@google.com> 1516835210 +0000
committer android-build-merger <android-build-merger@google.com> 1516835210 +0000

Merge "Avoid symlink of simpleperf." am: 908a3f30b5 am: 1ce28d40fd
am: 0d4b0a82c5

Change-Id: Ia6d38f928d5a686acdb83a3965fdd21fbd0a4ec4