OSDN Git Service

Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev
authorRoozbeh Pournader <roozbeh@google.com>
Fri, 16 Oct 2015 21:54:12 +0000 (21:54 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 16 Oct 2015 21:54:12 +0000 (21:54 +0000)

Trivial merge