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:
db843c9
d6c1126
)
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386
author
Christopher Tate
<ctate@google.com>
Fri, 17 Jun 2016 00:18:48 +0000
(
00:18
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 17 Jun 2016 00:18:48 +0000
(
00:18
+0000)
am:
d6c1126fab
Change-Id: I0414a137b1aab218fa57f291dbf2f7a1519bd973
Trivial merge