tree 9a32127b6b5ae61519a4247fdc7176d7e3d7de38
parent 0f326c16caa7439d4a3a82b7431aa8fbac906f09
parent f2fa27393c59ec00cd4057e5ef2514dbfda3611b
author Yabin Cui <yabinc@google.com> 1496713878 +0000
committer android-build-merger <android-build-merger@google.com> 1496713878 +0000

Merge "simpleperf: fix app_profiler.py." am: d98c857902 am: 5ea663c3ab am: 545ee30d39
am: f2fa27393c

Change-Id: Ib4245d4d936ea836c94f83b72c98aa0d3be47cbc