Merge "Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev am: d86ac8116b am: 8806a4bdc8" into nyc-mr1-dev-plus-aosp

Browse Source

am: 38f8eb343f

* commit '38f8eb343f1055f552d437560353aa3701bea764':

Change-Id: Icb1e0b372c687d72686055d0e8cc962eb4964134

...

This commit is contained in:

Victor Chang

2016-05-23 12:11:04 +00:00

committed by android-build-merger

parent a0e421d4e9 38f8eb343f

commit d9e0315858

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available