OSDN Git Service
(root)
/
android-x86
/
packages-apps-Camera2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
959da56
25a33ce
)
[automerger skipped] Merge "DO NOT MERGE"
author
The Android Open Source Project
<initial-contribution@android.com>
Fri, 7 Dec 2018 01:55:42 +0000
(17:55 -0800)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 7 Dec 2018 01:55:42 +0000
(17:55 -0800)
am:
25a33ce5e7
-s ours
Change-Id: I4b5e6cdc7e5b314b26c3eb26196c562ea852203a
Trivial merge