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:
34c2d7e
43ddfd8
)
am ccfcd9e8: Merge "Fxi initial error popup dialog in TextEdit and refreshed assets...
author
Gilles Debunne
<debunne@google.com>
Mon, 31 Jan 2011 19:13:24 +0000
(11:13 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 31 Jan 2011 19:13:24 +0000
(11:13 -0800)
* commit '
ccfcd9e813d090ec9b4390b5217b32f73dd8263d
':
Fxi initial error popup dialog in TextEdit and refreshed assets.
Trivial merge