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

* commit 'f15aaf55d67d1644888df43374b7df7cdcb91213':