OSDN Git Service
(root)
/
android-x86
/
packages-apps-Launcher3.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1a187d4
d31dcbc
)
Manual revert due to conflict:
author
Hyunyoung Song
<hyunyoungs@google.com>
Tue, 23 Feb 2016 19:56:32 +0000
(19:56 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 23 Feb 2016 19:56:32 +0000
(19:56 +0000)
am:
d31dcbcc7c
* commit '
d31dcbcc7c7901959c65c4e635e59274a1d4c334
':
Manual revert due to conflict:
1
2
src/com/android/launcher3/widget/WidgetCell.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/launcher3/widget/WidgetsListAdapter.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/launcher3/widget/WidgetCell.java
Simple merge
diff --cc
src/com/android/launcher3/widget/WidgetsListAdapter.java
Simple merge
OSDN Git Service
