OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2de89ae 0221328)
am 0221328c: am b3538082: am 5362f273: Merge "Fix line height problem with inline...
authorRoozbeh Pournader <roozbeh@google.com>
Fri, 16 Oct 2015 22:12:46 +0000 (22:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 16 Oct 2015 22:12:46 +0000 (22:12 +0000)
* commit '0221328c3381680631d783c2b9733430f8b0555d':
  Fix line height problem with inline images in StaticLayout.


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