OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e06bdea
ccb75a8
)
am ccb75a88: Merge "Update the API file." into gingerbread
author
Dan Bornstein
<danfuzz@android.com>
Mon, 1 Nov 2010 23:09:44 +0000
(16:09 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 1 Nov 2010 23:09:44 +0000
(16:09 -0700)
* commit '
ccb75a882f670f8928f13a485c0c29b8b8b93af3
':
Update the API file.
1
2
api/current.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
api/current.xml
Simple merge