tree 6e275274bf97295d8d51bf3796cfc2569163a776
parent a3bb226b08b3a31233e3ba3c8b7925eec0e3314b
parent 457a10d29c151664fc274c06be7e44f813b12767
author Jorim Jaggi <jjaggi@google.com> 1410205602 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1410205605 +0000

Merge "Restrict line count for BigTextStyle" into lmp-dev