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:
455006c
682c2ed
)
Merge changes Ic198dc44,I15f000bf
author
Mark Salyzyn
<salyzyn@google.com>
Fri, 5 Aug 2016 17:26:28 +0000
(17:26 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 5 Aug 2016 17:26:28 +0000
(17:26 +0000)
am:
682c2ede09
-s ours
Change-Id: I69584d0b778ca9ffa6c8f2965a874cf63fa650d7
Trivial merge