OSDN Git Service

am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev
authorZach Riggle <riggle@google.com>
Thu, 17 Sep 2015 22:25:53 +0000 (22:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Sep 2015 22:25:53 +0000 (22:25 +0000)
commitad0acf1d104988238f431d874f0ecf9917a06699
treefc66900111f3cb4bb6bfdff9f86734e92fe3c8e4
parent716c6269674474867dc4720f86f739c639c83400
parent9836b64f529238d1219f1937abf481383cd0cacd
am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev

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