Victor Chang 8806a4bdc8 Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev ...

am: d86ac8116b

* commit 'd86ac8116bfc64c61d8124ff8d3e92be5e55cd3e':
  New api in LockSettingsService to get StrongAuth synchronously

Change-Id: I07d18fd5c472f1ab3f3ad4c37583e9092f4431b4

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

..

android

Merge "Use an attribute for the network security config resource" into nyc-dev

2016-05-23 02:32:19 +00:00

com

Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev

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

org/apache/http

…

jarjar-rules.txt

…

overview.html

…