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