| commit | b9b3759e9eff8dbe2894caf30fc6fc59a1bfac3c | [log] [tgz] |
|---|---|---|
| author | Zach Riggle <riggle@google.com> | Thu Sep 17 22:33:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 22:33:34 2015 +0000 |
| tree | 36e59a48ce3dffa16c0541209104ce6e1b2449fe | |
| parent | db0d4cdd1d8141957f3cc5a516381412fcd40430 [diff] | |
| parent | 9e459903b894f79ba3b21925ba022167308bd140 [diff] |
am ad0acf1d: am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev * commit 'ad0acf1d104988238f431d874f0ecf9917a06699': DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.