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:
413a63e
562e577
)
Merge "Merge changes Id0d536ff,I4fcd0ad7 into oc-dev am: 0e8090b10e" into oc-dev...
author
Hugo Benichi
<hugobenichi@google.com>
Fri, 14 Apr 2017 17:32:27 +0000
(17:32 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 14 Apr 2017 17:32:27 +0000
(17:32 +0000)
am:
562e577b1c
-s ours
Change-Id: I87c54fe259d38b87c84485793aa5820b55650583
Trivial merge