tree a5a1e5334ce79997c2c7c895a5ecd97eb49170bf
parent 300bbc8cbde463ad5a4f63b3a1c4b630509b9552
parent c1a5f290f6ee00da0f9d6fb0f49751cf31ef8ede
author Yabin Cui <yabinc@google.com> 1498158892 +0000
committer android-build-merger <android-build-merger@google.com> 1498158892 +0000

Merge "simpleperf: Support Ctrl-C in app_profiler.py." am: 7941d1917b
am: c1a5f290f6

Change-Id: I2328a2844cccfe1db5db44a824374b44122d888f