| commit | 38a248ca3930353baa1bef1eed6603e462c928f3 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Mon Sep 21 18:51:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 18:51:17 2015 +0000 |
| tree | e89d89e8e9439ccbec80fc1817ef7f7b3d6a73ac | |
| parent | 03eb85b41da9fe735de743c7d39a580665a40d89 [diff] | |
| parent | c2c6a4414c3c18f2131b7f9f4c18b305e31c5aa1 [diff] |
am c2c6a441: am 39f73105: am 9e2a0079: 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 'c2c6a4414c3c18f2131b7f9f4c18b305e31c5aa1':