OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 318f0fe 11b14e3)
am 11b14e39: (-s ours) LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE]
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 8 Oct 2014 03:28:20 +0000 (03:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Oct 2014 03:28:20 +0000 (03:28 +0000)
* commit '11b14e3996d3602155d6a61afb286e5bc0941a1f':
  LayoutLib: Use ICU's line break algo. [DO NOT MERGE]


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