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:
4e33014
1c251f9
)
am cea03df2: Do not merge. Return null id for Non-phone device.
author
John Wang
<johnwang@google.com>
Wed, 8 Jun 2011 20:52:26 +0000
(13:52 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 8 Jun 2011 20:52:26 +0000
(13:52 -0700)
* commit '
cea03df201dc6659654234bc5fbfebf1b6a06e42
':
Do not merge. Return null id for Non-phone device.
Trivial merge