tree d1e56ed56075c7f29dd8b50a604100044cd51737
parent 70ea857859b78a708fb99ac708ead7bdaddf79a7
parent 431e506b53e59b21a7d18bf46476b8c1528fabf1
author Roozbeh Pournader <roozbeh@google.com> 1445032452 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1445032452 +0000

Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev