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:
5e4f470
165f684
)
Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265...
author
Adam Lesinski
<adamlesinski@google.com>
Wed, 5 Jul 2017 21:29:41 +0000
(21:29 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 5 Jul 2017 21:29:41 +0000
(21:29 +0000)
am:
165f684a63
-s ours
Change-Id: I79eeba15724d751cd4dcac88369fd7c10dec17c1
Trivial merge