tree fad5cc8a4fb286c54582cce4c32e44b4fa78d280
parent d7cedd2a22b59f11dcc4912234db199aeef619c2
parent 1e44409206f164fdd2b3cb1bec5bda8ef17806f6
author Doris Liu <tianliu@google.com> 1358217757 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358217757 -0800

am 1e444092: Merge "Ellipsize long text and use the framework switch" into gb-ub-photos-bryce

* commit '1e44409206f164fdd2b3cb1bec5bda8ef17806f6':
  Ellipsize long text and use the framework switch