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