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:
35b29de
902fb85
)
am a058f565: (-s ours) am ca36d863: Update API current.xml to unbreak build.
author
Nick Pelly
<npelly@google.com>
Thu, 13 Jan 2011 01:57:30 +0000
(17:57 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 13 Jan 2011 01:57:30 +0000
(17:57 -0800)
* commit '
a058f565663253077c3118d9aad00e03dcd45684
':
Update API current.xml to unbreak build.
Trivial merge