OSDN Git Service
(root)
/
android-x86
/
hardware-interfaces.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fc37131
5d18c87
)
Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dev am:...
author
Emilian Peev
<epeev@google.com>
Tue, 15 Aug 2017 21:10:24 +0000
(21:10 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 15 Aug 2017 21:10:24 +0000
(21:10 +0000)
am:
5d18c87e88
-s ours
Change-Id: Ib03c1512099ec88e1c65672dadbe29ef3b9d9086
Trivial merge