diff options
| author | jrizzoli <joey@cyanogenmoditalia.it> | 2015-11-05 14:24:50 +0100 |
|---|---|---|
| committer | jrizzoli <joey@cyanogenmoditalia.it> | 2015-11-05 14:24:50 +0100 |
| commit | 13fca8d729e188ca71802408b095d256a499a750 (patch) | |
| tree | 71db2668cefc0b9aa803289390f1a884a6447f74 /assets | |
| parent | f63f311e2ce4c7986404d343bec777f32e40a04e (diff) | |
| download | android_packages_apps_Gello-13fca8d729e188ca71802408b095d256a499a750.tar.gz android_packages_apps_Gello-13fca8d729e188ca71802408b095d256a499a750.tar.bz2 android_packages_apps_Gello-13fca8d729e188ca71802408b095d256a499a750.zip | |
gello: fix mismerge
Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
Diffstat (limited to 'assets')
0 files changed, 0 insertions, 0 deletions