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:
19e9ecc
944d8e9
)
am 67b50606: Merge "Fix the simulator build." into gingerbread
author
Eric Laurent
<elaurent@google.com>
Wed, 25 Aug 2010 17:39:21 +0000
(10:39 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 25 Aug 2010 17:39:21 +0000
(10:39 -0700)
Merge commit '
67b506065e9fe3c56e3d1b47eedfa01170d574f9
' into gingerbread-plus-aosp
* commit '
67b506065e9fe3c56e3d1b47eedfa01170d574f9
':
Fix the simulator build.
Trivial merge