OSDN Git Service

am 69a141e0: am 9d68ed0e: Merge "Add timeout for dump_file."
authorChristopher Ferris <cferris@google.com>
Thu, 26 Feb 2015 18:49:48 +0000 (18:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 26 Feb 2015 18:49:48 +0000 (18:49 +0000)
commit04e13acdbf208277cfea17d331e702ad6afd6603
treeb6b624f63d15d777d1873e4b67c198319b649be9
parentd6c8ae9c15fc335f2be0a567edd1c3d5247b0187
parent69a141e07fab2672cf2cc23dcc124c46995fbf98
am 69a141e0: am 9d68ed0e: Merge "Add timeout for dump_file."

* commit '69a141e07fab2672cf2cc23dcc124c46995fbf98':
  Add timeout for dump_file.