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:
8ade276
a01e221
)
Merge "Fix NPE in LockSettingsService." into cw-f-dev am: 4aff3d53ef
author
Andrew Zeng
<zenga@google.com>
Thu, 16 Mar 2017 23:40:09 +0000
(23:40 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 16 Mar 2017 23:40:09 +0000
(23:40 +0000)
am:
a01e2212c8
Change-Id: Id333403e3a989e233a97760b716055b3abd186d6
Trivial merge