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:
5d39f66
057da39
)
Merge "Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543...
author
Esteban Talavera
<etalavera@google.com>
Fri, 11 Aug 2017 13:24:03 +0000
(13:24 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 11 Aug 2017 13:24:03 +0000
(13:24 +0000)
am:
057da39d89
-s ours
Change-Id: Icc3fc5ff09bf66d00c4e4d1f2f633cd6bf33c26b
Trivial merge