OSDN Git Service

Merge "Fix the benchmark fail by caliper\'s change" am: 92f9d53e98
authorPaul Duffin <paulduffin@google.com>
Mon, 16 May 2016 10:21:24 +0000 (10:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 May 2016 10:21:24 +0000 (10:21 +0000)
am: f3f01d4f1c

* commit 'f3f01d4f1ca4b9017e5e00bbb94a4e69519106f0':
  Fix the benchmark fail by caliper's change

Change-Id: Iaec9874ea04393762d30edd73e284d2e2a784201


Trivial merge