| commit | dc6c4ac223622d2830cc582b26d66b455c434706 | [log] [tgz] |
|---|---|---|
| author | Dan Cartier <nospamdan1@gmail.com> | Tue Jun 23 23:13:14 2015 -0400 |
| committer | Dan Cartier <nospamdan1@gmail.com> | Tue Jun 23 23:13:14 2015 -0400 |
| tree | d8d92397e46ed378cf2073fd7d91f9eaec3534ce | |
| parent | 6d12e7bf4c9da4313c5581b191dd4f92b0afddec [diff] | |
| parent | d64d843b643e6704b6db40551b2cff7aaf82c147 [diff] |
Merge branch 'c5.1' of github.com:CandyDevices/device_samsung_hercules into c5.1 Conflicts: device.mk Change-Id: I0850e5c28a02b64911bf872d05d9b99e7c23c6a5