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:
98015e7
e7f3afb
)
Merge "Add DockUpdaterFeatureProvider and DockUpdater." into pi-dev am: 820a26c6bd
author
Ivan Chiang
<chiangi@google.com>
Wed, 25 Apr 2018 19:43:01 +0000
(12:43 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 25 Apr 2018 19:43:01 +0000
(12:43 -0700)
am:
e7f3afba9d
Change-Id: I0b1e8dd9f23b2077051341a991f309ace42cbb34
1
2
src/com/android/settings/overlay/FeatureFactoryImpl.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/overlay/FeatureFactoryImpl.java
Simple merge