| commit | cd8fc98287d6f2fd8cc0c680b67b051e7fb0e1da | [log] [tgz] |
|---|---|---|
| author | Zach Riggle <riggle@google.com> | Thu Sep 17 22:52:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 22:52:42 2015 +0000 |
| tree | 87249f8367608e95876ebaaafa93543bb5c497c4 | |
| parent | d5334121c495689b7d72b6b7ff9c471c8b7d7906 [diff] | |
| parent | 3c9ffc2d5ae7152ae8b303a7b3c8da0a2fc734cf [diff] |
am 3c9ffc2d: am 2ebcf2c2: am ad0acf1d: am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev * commit '3c9ffc2d5ae7152ae8b303a7b3c8da0a2fc734cf': DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.