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:
38382a4
7151be9
)
Merge "ConditionManager: don't crash when trying to add unexpected condition" am...
author
Thecrazyskull
<anaskarbila@gmail.com>
Sun, 4 Jun 2017 00:04:25 +0000
(
00:04
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Sun, 4 Jun 2017 00:04:25 +0000
(
00:04
+0000)
am:
7151be926d
Change-Id: I16805427f0d053c6d1c5975275f00cb0ed1c9cbb
1
2
src/com/android/settings/dashboard/conditional/ConditionManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/dashboard/conditional/ConditionManager.java
Simple merge