Merge branch 'cm-11.0' into stable/cm-11.0

Merge branch 'cm-11.0' into stable/cm-11.0

Merge branch 'cm-11.0' into stable/cm-11.0

Merge branch 'cm-11.0' into stable/cm-11.0

Conflicts:
	Android.mk

Change-Id: Ia371e5e2b34d8e5e69438ab5417bec5514366fa3

Merge branch 'cm-11.0' into stable/cm-11.0

Conflicts:
	Android.mk

Change-Id: Ia371e5e2b34d8e5e69438ab5417bec5514366fa3

LockClock: remove unused BroadcastReceiver

The reciver manifest tag was mispelled, so the
receiver never worked either way. The content provider
properly triggers an udpate so this class is not needed.

Change-Id: I113cc3fe5461475e365df9b5b3f8d70cae594e84
Signed-off-by: Roman Birg <roman@cyngn.com>

LockClock: remove unused BroadcastReceiver

The reciver manifest tag was mispelled, so the
receiver never worked either way. The content provider
properly triggers an udpate so this class is not needed.

Change-Id: I113cc3fe5461475e365df9b5b3f8d70cae594e84
Signed-off-by: Roman Birg <roman@cyngn.com>

LockClock: Sync translations and fixes with CM11

Change-Id: Ib4fad92905ad49d016efd6386770eee977620173
(cherry picked from commit 1736718)

CLock: CA translations

Change-Id: I5204bba9e23fa2a6885f82386d63dcff015e5f0e

Merge "LockClock: CS translation" into cm-10.2