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:
4d42d9d
d8c8305
)
am 1861225b: (-s ours) am fe682fd7: am cea03df2: Do not merge. Return null id for...
author
John Wang
<johnwang@google.com>
Thu, 9 Jun 2011 18:56:28 +0000
(11:56 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 9 Jun 2011 18:56:28 +0000
(11:56 -0700)
* commit '
1861225be3c848fdf395f7aa815c673af4239011
':
Do not merge. Return null id for Non-phone device.
Trivial merge
OSDN Git Service
