OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
da85640
6cea122
)
Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev
author
Fan Zhang
<zhfan@google.com>
Thu, 6 Oct 2016 20:49:12 +0000
(20:49 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 6 Oct 2016 20:49:12 +0000
(20:49 +0000)
am:
6cea122bfc
Change-Id: Iba84fbd3eedd674fa038fa515dba507d2c4b9e0e
Trivial merge