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:
cad75e2
49bef54
)
Merge "Enforce policy for camera gesture in keyguard" into oc-dev
author
Esteban Talavera
<etalavera@google.com>
Fri, 11 Aug 2017 12:34:00 +0000
(12:34 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 11 Aug 2017 12:34:00 +0000
(12:34 +0000)
am:
49bef543b3
-s ours
Change-Id: I69369945e8fc5c1090c8ee217b5d193f5fb1236d
Trivial merge