OSDN Git Service

Merge "simpleperf: make atest happy." am: 14638b2b85
authorYabin Cui <yabinc@google.com>
Fri, 1 Feb 2019 23:39:00 +0000 (15:39 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Feb 2019 23:39:00 +0000 (15:39 -0800)
commit98e1cb070f0a7e0b6b88145a67d8814ba63e12e8
tree7ac8b34225433219e8e1b1950bff7b2457270442
parenta2a9443e440dfbcfcd4c9cdb1b2f9de59c32d97c
parent0ecc9575a32b7a40c20ecb42659c40eb96ed269f
Merge "simpleperf: make atest happy." am: 14638b2b85
am: 0ecc9575a3

Change-Id: Ifa7d123cbbbbc7eba22d34e9f5c6a99db71f5fb6