| commit | 7fb088e5d4d19efa4437a4fee07f327184c31ba3 | [log] [tgz] |
|---|---|---|
| author | Dan Cartier <nospamdan1@gmail.com> | Sat Apr 18 12:43:25 2015 -0400 |
| committer | Dan Cartier <nospamdan1@gmail.com> | Sat Apr 18 12:43:25 2015 -0400 |
| tree | f9ca0dd2f9579e52d53e596a234eea2098720268 | |
| parent | 2a23f0bd1f467f7b10388a928299c95ff04b484a [diff] | |
| parent | dde9676f3204646f044c9ce075299e3ee6bc772f [diff] |
Merge branch 'c5' of git://github.com/SlimDev/device_samsung_hercules into c5 Conflicts: candy5.mk cm.dependencies Change-Id: Ibedab7f80b9dc3b624c4993335552a362139a247