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:
0537f16
6fd0671
)
Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6"
author
Adam Lesinski
<adamlesinski@google.com>
Wed, 5 Jul 2017 21:12:22 +0000
(21:12 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 5 Jul 2017 21:12:22 +0000
(21:12 +0000)
am:
6fd0671265
-s ours
Change-Id: Icefbb67a8046a4bc57de5f69bcc32ab235371ddc
Trivial merge