OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2f79966
38a8a8e
)
Merge "resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce...
author
Marco Nelissen
<marcone@google.com>
Tue, 14 Feb 2017 00:10:12 +0000
(
00:10
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 14 Feb 2017 00:10:12 +0000
(
00:10
+0000)
am:
38a8a8e2bc
Change-Id: I1f62126a268ceda90494a6ceab0e12588c0ed6d1
Trivial merge