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:
3c88506
248673e
)
Merge "Merge "Assist: Only call lockscreenShown when it is actually shown" into oc...
author
Adrian Roos
<roosa@google.com>
Thu, 3 Aug 2017 15:26:17 +0000
(15:26 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 3 Aug 2017 15:26:17 +0000
(15:26 +0000)
am:
248673e94f
Change-Id: I550c0b28dfcd9f9a34bb02f666d88dbd5882f200
Trivial merge