Victor Chang 937b468fb2 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev am: b0054ec4e2 ...

am: e8df0892d4

* commit 'e8df0892d427cd8eec0f43970e1241f8e42bc918':
  Fix Continous loop in unifed screenlock when trying to Trust a CA cert

Change-Id: Iac21f081af2d0cbad3c1174134854cdbcc204ec6

2016-05-23 12:03:44 +00:00

..

app

Import translations. DO NOT MERGE

2016-03-19 04:17:38 +01:00

unit

Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev am: b0054ec4e2

2016-05-23 12:03:44 +00:00

Android.mk

Change build targets for settings tests

2016-01-21 12:32:15 +00:00