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:
d4a5b56
273bd3b
)
Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev am: 0c2b2d1f87...
author
Tony Mak
<tonymak@google.com>
Thu, 17 Aug 2017 22:31:00 +0000
(22:31 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 17 Aug 2017 22:31:00 +0000
(22:31 +0000)
am:
273bd3b67f
-s ours
Change-Id: Ieaf82ea64474c031ca7677d7a14f7ab86d3b6b48
Trivial merge