tree e2492e4a5452e4450bb49f07d42a0b68c8141d49
parent a42870fcd6bbd15326fea45e156bd2462bf8a78a
parent d66d4d1bea063acefae6bab5faf822d7a363b216
author Bart Sears <bsears@google.com> 1441061867 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441061867 +0000

am d66d4d1b: am 627975fc: am 74890df7: (-s ours) am 3cb7e91f: am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev

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