diff options
| author | doc HD <doc.divxm@gmail.com> | 2015-09-15 11:39:33 +0300 |
|---|---|---|
| committer | doc HD <doc.divxm@gmail.com> | 2015-09-15 11:39:33 +0300 |
| commit | adae17cbd7e668fc9660e700654eb6dc3753131d (patch) | |
| tree | ee3cbb0f48062f07fc8b2adda903484ab7ee0419 | |
| parent | fb948ecb426f6f560fbc203a72ca041e63eaf1c6 (diff) | |
| parent | be6f854305e4c7f115af1c03dd1c994341f20fe1 (diff) | |
Merge branch 'cm-12.1' of https://github.com/CyanogenMod/android_device_samsung_i9500 into lp5.1
Conflicts:
cm.dependencies
cm.mk
Change-Id: Iecbeec85bf493570e3184e106841de42a31fe130
0 files changed, 0 insertions, 0 deletions