OSDN Git Service

Merge "simpleperf: fix app_profiler.py." am: f4f68176b3 am: 7ac7c486df
authorYabin Cui <yabinc@google.com>
Thu, 1 Jun 2017 21:32:01 +0000 (21:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Jun 2017 21:32:01 +0000 (21:32 +0000)
commit1c7a854e5fa68b76a308b57b683c293c56daf544
tree349f347ebd2b1e7a687de881e1c819d443f793d3
parent44171f8c75c0609ce966667b4259a5fb5ea6cb67
parentb396fbcceff891cde25311cd650e3beaa0f4cec0
Merge "simpleperf: fix app_profiler.py." am: f4f68176b3 am: 7ac7c486df
am: b396fbccef

Change-Id: I9b6db3b74fb389dec6556d3630d6fc80d289eb62