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:
c79e640
4a754f8
)
Merge "Deleting resources added due to merge conflicts" into ub-launcher3-calgary
author
Sunny Goyal
<sunnygoyal@google.com>
Wed, 6 Apr 2016 19:39:57 +0000
(19:39 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 6 Apr 2016 19:39:57 +0000
(19:39 +0000)
am:
4a754f8
* commit '
4a754f821bf1cf4434ee48a2783d79b421bda837
':
Deleting resources added due to merge conflicts
Change-Id: If24fd61b906d000e2a816de594c884a733423f16
Trivial merge