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