OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d6c8ae9
69a141e
)
am 69a141e0: am 9d68ed0e: Merge "Add timeout for dump_file."
author
Christopher Ferris
<cferris@google.com>
Thu, 26 Feb 2015 18:49:48 +0000
(18:49 +0000)
committer
Android 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