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:
cbb989a
4b6a13e
)
[automerger skipped] Fix build more am: d9d5f654c7 -s ours
author
Adrian Roos
<roosa@google.com>
Wed, 2 May 2018 16:12:06 +0000
(09:12 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 2 May 2018 16:12:06 +0000
(09:12 -0700)
am:
4b6a13ed45
-s ours
Change-Id: I702fa340b475688794ddb0e42a339f13e24b4770
Trivial merge