OSDN Git Service

Merge "simpleperf: fix two tests in test.py." am: 46d1f0b9ab am: 5d76b0b7a4
authorYabin Cui <yabinc@google.com>
Mon, 11 Dec 2017 22:51:45 +0000 (22:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Dec 2017 22:51:45 +0000 (22:51 +0000)
commit543b081691e0be4f98e0e8a47d1a1d9b2a06ac63
tree5775231c3c4a2f41e8c11e77603f4b2daff3cd54
parentc848aa67eddfce2fdf6304f926b86cd491ad5e4c
parent6a01865189d4f2a01d56d941ef0a186399819021
Merge "simpleperf: fix two tests in test.py." am: 46d1f0b9ab am: 5d76b0b7a4
am: 6a01865189

Change-Id: I958877e323762df6b5dbcc598498e56f2b67b368