Commit c7d1dd69 authored by Daisuke Miyakawa's avatar Daisuke Miyakawa Committed by Android Git Automerger
Browse files

am 420fa444: (-s ours) DO NOT MERGE. Use minHeight to allow large fonts. 

* commit '420fa444':
  DO NOT MERGE. Use minHeight to allow large fonts.
parents 426bca36 420fa444
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment