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:
d1e0bf2
f0bb181
)
am 229d3a0c: am fc94d45f: Merge "Make getDeviceId return null for Non-phone device...
author
John Wang
<johnwang@google.com>
Thu, 9 Jun 2011 18:25:50 +0000
(11:25 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 9 Jun 2011 18:25:50 +0000
(11:25 -0700)
* commit '
229d3a0cbce70db82003705abf6844deec136d20
':
Make getDeviceId return null for Non-phone device.
Trivial merge