tree 8b0cf1a24eac5b94ca92ed80c882ca78d5684f59
parent 4319bd92ad504457a5389cd4b1e2fa6553be4a78
parent e1e462b9f2313b547e86e13b5524d4a8813f87d5
author Yabin Cui <yabinc@google.com> 1470696810 +0000
committer android-build-merger <android-build-merger@google.com> 1470696810 +0000

Merge "simpleperf: fix test record_cmd.duration_option." am: 8cd939bd7a
am: e1e462b9f2

Change-Id: I8e239553d378c5f1c1500551562f72bf5a562ee1