OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28e2117 33ba0be)
am 46e327ca: (-s ours) Merge "Fix bug #5504346 Hung in native_getTextRunAdvances...
authorFabrice Di Meglio <fdimeglio@google.com>
Tue, 1 Nov 2011 19:42:48 +0000 (19:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Nov 2011 19:42:48 +0000 (19:42 +0000)
* commit '46e327ca32a29432941ba4487077577b10243aed':
  Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help