am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev

* commit '683cd049f7c762251567a0e0386ee49bb1428351':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
This commit is contained in:
Zach Riggle
2015-09-17 22:00:29 +00:00
committed by Android Git Automerger

Diff Content Not Available