| commit | 04e13acdbf208277cfea17d331e702ad6afd6603 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Thu Feb 26 18:49:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 26 18:49:48 2015 +0000 |
| tree | b6b624f63d15d777d1873e4b67c198319b649be9 | |
| parent | d6c8ae9c15fc335f2be0a567edd1c3d5247b0187 [diff] | |
| parent | 69a141e07fab2672cf2cc23dcc124c46995fbf98 [diff] |
am 69a141e0: am 9d68ed0e: Merge "Add timeout for dump_file." * commit '69a141e07fab2672cf2cc23dcc124c46995fbf98': Add timeout for dump_file.