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:
829ef5d
9aa4c6e
)
am 156a3c9b: am 7928ca6f: Merge "Fail to parse duration instead of asserting, if...
author
Andreas Huber
<andih@google.com>
Wed, 12 Jan 2011 22:38:17 +0000
(14:38 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 12 Jan 2011 22:38:17 +0000
(14:38 -0800)
* commit '
156a3c9ba702f3159e0b4a76c65606b5f97b276c
':
Fail to parse duration instead of asserting, if the server response cannot be parsed.
Trivial merge