OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
38aff68
d86ac81
)
Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev
author
Victor Chang
<vichang@google.com>
Mon, 23 May 2016 11:58:41 +0000
(11:58 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 23 May 2016 11:58:41 +0000
(11:58 +0000)
am:
d86ac8116b
* commit '
d86ac8116bfc64c61d8124ff8d3e92be5e55cd3e
':
New api in LockSettingsService to get StrongAuth synchronously
Change-Id: I3fe13c51d5d33f5689f0b4130a33cf3a2777e186
Trivial merge