tree d67747275662fabf20414dd31ae6c0060ac292d3
parent e6ba77724843e597acf64ee286fb465af52aa6db
parent cc883b9a002341f8af219a8fe89f1c239314da81
author Raph Levien <raph@google.com> 1349474887 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349474887 -0700

Merge "Fix android.cts.text.TextUtilsTest#testEllipsize test" into jb-mr1-dev