| commit | 9e2a00794e5b08e3c2a6866246041612eb23bea6 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Mon Sep 21 18:25:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 18:25:44 2015 +0000 |
| tree | d61edb32750f9417f3672107254d96f4f60db6c2 | |
| parent | 8850bf3ecdc0d951b32b06bc70e14755ec124385 [diff] | |
| parent | 62e59219edcaf734b493179b1dfb80db0e5d6c75 [diff] |
am 62e59219: am 3e354050: am 9576ae86: Merge "Fix for failing test of testEOS because checksum takes too long" into jb-mr2-cts-dev automerge: a00f78c automerge: 37f4b54 -s ours * commit '62e59219edcaf734b493179b1dfb80db0e5d6c75':