tree 8adcaa084c2837ef2cc3dc9409e5eadc8e2eb5de
parent ac8f57e86a06b04e2218da8c0deab5872e078ac7
parent a00f78c853328979f0bc7f9dea3b29bb587b1543
author Daniel Xie <dxie@google.com> 1435601022 +0000
committer android-build-merger <android-build-merger@google.com> 1435601022 +0000

Merge "Fix for failing test of testEOS because checksum takes too long" into jb-mr2-cts-dev
automerge: a00f78c

* commit 'a00f78c853328979f0bc7f9dea3b29bb587b1543':
  Fix for failing test of testEOS because checksum takes too long