diff options
| author | Zach Riggle <riggle@google.com> | 2015-09-17 22:00:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-17 22:00:29 +0000 |
| commit | f68b1953259a13562f5a2331526edafae5c1d99f (patch) | |
| tree | 0bac82d1d35f68b75a235354d24ca65d6e4ccfb1 | |
| parent | 11317e82cf561597bbd4e2dbf5840854e6b7a16d (diff) | |
| parent | 683cd049f7c762251567a0e0386ee49bb1428351 (diff) | |
| download | frameworks_base-f68b1953259a13562f5a2331526edafae5c1d99f.zip frameworks_base-f68b1953259a13562f5a2331526edafae5c1d99f.tar.gz frameworks_base-f68b1953259a13562f5a2331526edafae5c1d99f.tar.bz2 | |
am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev
* commit '683cd049f7c762251567a0e0386ee49bb1428351':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
0 files changed, 0 insertions, 0 deletions