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:
c872c14
135fecb
)
Merge "Use "mid" stable id for condition cards conditionally." into oc-mr1-dev
author
TreeHugger Robot
<treehugger-gerrit@google.com>
Sat, 16 Sep 2017 00:33:33 +0000
(
00:33
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Sat, 16 Sep 2017 00:33:33 +0000
(
00:33
+0000)
1
2
src/com/android/settings/dashboard/DashboardData.java
patch
|
diff1
|
diff2
|
blob
|
history
tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/dashboard/DashboardData.java
Simple merge
diff --cc
tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
Simple merge