OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
46a04ec
f65e790
)
resolve merge conflicts of 94c5202965 to oc-dr1-dev
author
Phil Weaver
<pweaver@google.com>
Thu, 31 Aug 2017 17:34:40 +0000
(17:34 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 31 Aug 2017 17:34:40 +0000
(17:34 +0000)
am:
f65e790ba0
Change-Id: Id77101229f9c4ceca346f7c2d281d9602f3dd204
Trivial merge