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:
e606757
199f965
)
Merge commit '199f9655' into manualmerge
author
Nick Kralevich
<nnk@google.com>
Fri, 1 Mar 2013 18:01:29 +0000
(10:01 -0800)
committer
Nick Kralevich
<nnk@google.com>
Fri, 1 Mar 2013 18:01:29 +0000
(10:01 -0800)
these files no longer exist in jb-mr2-dev, so this patch is useless.
Accept the version in jb-mr2-dev
Trivial merge