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:
61c338e
21b22f0
)
Merge "Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"" into oc-mr1-dev
author
Matthew Fritze
<mfritze@google.com>
Tue, 1 Aug 2017 01:01:35 +0000
(
01:01
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 1 Aug 2017 01:01:35 +0000
(
01:01
+0000)
am:
21b22f0154
Change-Id: I9f203d14386598c0cb9c3264350564d75280e9a7
Trivial merge