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)
* commit '69a141e07fab2672cf2cc23dcc124c46995fbf98':
  Add timeout for dump_file.


Trivial merge