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:
5d634d7
325c567
)
Merge "Attempt to fix bug where OwnerInfo gets lost." into nyc-dev
author
Jim Miller
<jaggies@google.com>
Wed, 2 Mar 2016 23:01:58 +0000
(23:01 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 2 Mar 2016 23:01:59 +0000
(23:01 +0000)
1
2
services/core/java/com/android/server/LockSettingsService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/LockSettingsService.java
Simple merge