tree 17c762d634007e8852dc8ae2268fd78182358b12
parent f669b07c8827db7de9383144c0151f84cd6f2947
parent 43ce8930b2993e4e2fef73a2d2200c9afdebdaf6
author Zach Riggle <riggle@google.com> 1442531383 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442531383 +0000

am 43ce8930: am cd8fc982: am 3c9ffc2d: am 2ebcf2c2: am ad0acf1d: am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev

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