tree 0887ed6bc606a8453856466835cefd7f9dacec35
parent 8aa8fe2c64cf4611ba68d90992e54858a35aae58
parent ae119af517fc427ead5bd6a3394b3b1f92df790d
author Paul Duffin <paulduffin@google.com> 1449529968 +0000
committer android-build-merger <android-build-merger@google.com> 1449529968 +0000

Merge "Switch to the latest version of Caliper"
am: ae119af517

* commit 'ae119af517fc427ead5bd6a3394b3b1f92df790d':
  Switch to the latest version of Caliper