tree 4abac93348336b035e1f161c0771faf73a18eab2
parent 4135a54df9fc196feb76ce7364425b19647866e4
parent 0ec9daecc6129529fc6f2d66c29876eca88c492f
author Paul Duffin <paulduffin@google.com> 1449584223 -0800
committer android-build-merger <android-build-merger@google.com> 1449584223 -0800

Merge "Follow-up to Switch to the latest version of Caliper" am: 80d5bef6f9
am: 0ec9daecc6

* commit '0ec9daecc6129529fc6f2d66c29876eca88c492f':
  Follow-up to Switch to the latest version of Caliper