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:
9d45108
35ea90d
)
am 35ea90de: am b5e380a7: (-s ours) am e33044ea: (-s ours) Merge change Ib9cc041e...
author
Ying Wang
<wangying@google.com>
Thu, 5 Nov 2009 00:42:17 +0000
(16:42 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 5 Nov 2009 00:42:17 +0000
(16:42 -0800)
Merge commit '
35ea90deee5050a66909b2740601bd81f9f29780
' into eclair-mr2-plus-aosp
* commit '
35ea90deee5050a66909b2740601bd81f9f29780
':
Explicitly specify that online-sdk depends on framework-res. (do not merge)
Trivial merge