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:
df8ec5b
236b8cc
)
am 8fa25162: (-s ours) am 3b8d33b1: (-s ours) Merge "Fix bug #5504346 Hung in native_...
author
Fabrice Di Meglio
<fdimeglio@google.com>
Wed, 2 Nov 2011 17:49:08 +0000
(17:49 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 2 Nov 2011 17:49:08 +0000
(17:49 +0000)
* commit '
8fa25162a5a3b30cf2c7576daec9e7618957a64e
':
Fix bug #
5504346
Hung in native_getTextRunAdvances - DO NOT MERGE
Trivial merge