diff options
| author | Victor Chang <vichang@google.com> | 2016-05-23 12:11:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-23 12:11:04 +0000 |
| commit | d9e031585844698ffa36e01d840c67814ba85169 (patch) | |
| tree | d2be4a8195c310abd2e0445ffd31609730d79593 /docs/html/sdk/api_diff/20 | |
| parent | a0e421d4e984925d09cab38b82db87c1c099c345 (diff) | |
| parent | 38f8eb343f1055f552d437560353aa3701bea764 (diff) | |
Merge "Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev am: d86ac8116b am: 8806a4bdc8" into nyc-mr1-dev-plus-aosp
am: 38f8eb343f
* commit '38f8eb343f1055f552d437560353aa3701bea764':
Change-Id: Icb1e0b372c687d72686055d0e8cc962eb4964134
Diffstat (limited to 'docs/html/sdk/api_diff/20')
0 files changed, 0 insertions, 0 deletions