OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1743e97
92d0316
)
Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev
author
Siyamed Sinir
<siyamed@google.com>
Fri, 27 May 2016 18:45:17 +0000
(18:45 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 27 May 2016 18:45:17 +0000
(18:45 +0000)
am:
92d0316d28
* commit '
92d0316d2837baceffb22e1a7eb0e5da50f0a025
':
Set StaticLayout.maxLines only when ellipsize is set
Change-Id: I17934afae1d5e8b7fe3b3ad8b4286dd43f68393e
Trivial merge