OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
644ff2f
fcda22b
)
am fcda22b1: Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc...
author
Andreas Gampe
<agampe@google.com>
Thu, 30 Apr 2015 18:05:53 +0000
(18:05 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 30 Apr 2015 18:05:53 +0000
(18:05 +0000)
* commit '
fcda22b1fe33370922a53d6562aa15366818bd45
':
am
b6d14a00
: resolved conflicts for merge of
c29791d5
to mnc-dev-plus-aosp
Trivial merge