OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b54bebf
9697493
)
am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h
author
Gloria Wang
<gwang@google.com>
Wed, 27 Apr 2011 19:24:42 +0000
(12:24 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 27 Apr 2011 19:24:42 +0000
(12:24 -0700)
* commit '
969749319ca17f6e0c6836303a78cc484df2539b
':
Add heartbeat error codes into MediaErrors.h
Trivial merge