epicmtd: wimax: reset retry count on reconnect
Merge pull request #504 from bbelos/cm-11.0

epicmtd: wimax: reset retry count on reconnect
Revert "serrano: Use old time_daemon binary for now"

This reverts commit c7555afe088f4a32152c49369f4b0c8bb288d195.
Merge pull request #505 from arco/cm-11.0

Revert "serrano: Use old time_daemon binary for now"
serrano: Use modified TimeService.apk

 * Fixes crash with ART
Merge pull request #506 from arco/cm-11.0

serrano: Use modified TimeService.apk
Merge branch 'cm-11.0' of git://github.com/TheMuppets/proprietary_vendor_samsung into cm-11.0