OSDN Git Service

Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into...
authorVictor Chang <vichang@google.com>
Mon, 23 May 2016 11:58:58 +0000 (11:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 May 2016 11:58:58 +0000 (11:58 +0000)
am: b0054ec4e2

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

Change-Id: If02ac2e8ddb0438e3b96491686fcd57a646d5a1f


Trivial merge