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:
a3ff44a
44503ab
)
Merge "Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev am...
author
Tony Mak
<tonymak@google.com>
Thu, 17 Aug 2017 22:47:15 +0000
(22:47 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 17 Aug 2017 22:47:15 +0000
(22:47 +0000)
am:
44503ab313
-s ours
Change-Id: I2dc1e3b819f3400613af1ed7827e129a5d5bff54
Trivial merge