tree 4dc6629028530f6e711ab11fbfbfb0f19e58ac6d
parent 952d5b334ccdf9cab0f56673861906e59d4e9933
parent ad0acf1d104988238f431d874f0ecf9917a06699
author Zach Riggle <riggle@google.com> 1442529214 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442529214 +0000

am ad0acf1d: am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev

* commit 'ad0acf1d104988238f431d874f0ecf9917a06699':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.