| commit | 69a141e07fab2672cf2cc23dcc124c46995fbf98 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Thu Feb 26 18:40:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 26 18:40:42 2015 +0000 |
| tree | b4212243a4fff89639afdd76fc13bfa1dd678bdb | |
| parent | 2f655daeea66bf5d0e065b45a7abd515cfeeaf97 [diff] | |
| parent | 9d68ed0ecd3a101c13a163cfe730b13b1564b442 [diff] |
am 9d68ed0e: Merge "Add timeout for dump_file." * commit '9d68ed0ecd3a101c13a163cfe730b13b1564b442': Add timeout for dump_file.