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:
5330df5
d5f3ae5
)
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258...
author
Dmitry Dementyev
<dementyev@google.com>
Thu, 9 Mar 2017 18:29:27 +0000
(18:29 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 9 Mar 2017 18:29:27 +0000
(18:29 +0000)
am:
d5f3ae5cac
Change-Id: Iacd8197fe2d48921a7b5adc71298ae8a00bb871d
Trivial merge