tree 715d547d2502de8d04de0ec12233b3183ce62c99
parent bd3e0b2f04fb298b2a6335b33e51b8d30bdadf0f
parent 98efab2d28a08f56c4ab04a3bce14a21cd13ad44
author Raph Levien <raph@google.com> 1440672257 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672257 +0000

am 98efab2d: (-s ours) am 8304c6c0: Merge "Truncate and ellipsize app name if too long for dialog." into mnc-dev

* commit '98efab2d28a08f56c4ab04a3bce14a21cd13ad44':