| commit | 8afbe0648a6e85e76f14df26b6627911df6d88a3 | [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 | e2672ca547a68f4d9dff978e68de3e2fafbbc64e | |
| parent | 1dd9f6d96e819154c34c14e699d8078e65eb114c [diff] | |
| parent | 8d762c5d7ae9d1519a0714c2b10348a1ac0239b0 [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.