| commit | 38f8eb343f1055f552d437560353aa3701bea764 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Mon May 23 12:04:52 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon May 23 12:04:53 2016 +0000 |
| tree | f18b4f23760535840cf3c0410eb17d186883dd01 | |
| parent | 8dda22449b47ff3f9fa22c8ee790baaa502ef610 [diff] | |
| parent | 76ed5ce26ca34ac0adbff7a5e366ad0958d3a4c6 [diff] |
Merge "Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev am: d86ac8116b am: 8806a4bdc8" into nyc-mr1-dev-plus-aosp