OSDN Git Service

am 8fa25162: (-s ours) am 3b8d33b1: (-s ours) Merge "Fix bug #5504346 Hung in native_...
authorFabrice Di Meglio <fdimeglio@google.com>
Wed, 2 Nov 2011 17:49:08 +0000 (17:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Nov 2011 17:49:08 +0000 (17:49 +0000)
commitb4101ef60608b96e1fe79e8cd16acd55cef71470
tree1d90b398fb949e1e316b658c863f2f87f7814afb
parentdf8ec5b615ab45c0992e2ef4a6f841f9cbb2252e
parent236b8cc4079f2c94d2f894486baed451aeeefd04
am 8fa25162: (-s ours) am 3b8d33b1: (-s ours) Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr1

* commit '8fa25162a5a3b30cf2c7576daec9e7618957a64e':
  Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE