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:
36de63d
a6d9716
)
Merge "Keyguard: fix possible divergent state" into pi-dev am: 5d8dfe17c8
author
Adrian Roos
<roosa@google.com>
Wed, 25 Apr 2018 15:50:52 +0000
(08:50 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 25 Apr 2018 15:50:52 +0000
(08:50 -0700)
am:
a6d97163d6
Change-Id: Ib514eb5efd239d3659229339a34a7f651607bf50
Trivial merge