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:
c84e8f3
1238ffc
)
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a2156...
author
Narayan Kamath
<narayan@google.com>
Fri, 26 Aug 2016 00:42:28 +0000
(
00:42
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 26 Aug 2016 00:42:28 +0000
(
00:42
+0000)
am:
1238ffcd2c
Change-Id: I7f4d19c3c406157693aef46b695f0790b74d0cee
Trivial merge