Victor Chang 4d43e9a764 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev ...

am: b0054ec4e2

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

Change-Id: I01cd2b287d78484c1653476b75b6d300dec0c34d

2016-05-23 11:59:19 +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

2016-05-23 11:59:19 +00:00

Android.mk

Change build targets for settings tests

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