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:
6098f6d
dc7e45e
)
[automerger skipped] Merge "Fix UiccSlotInfo equals method." am: 147dc32b0b
author
Xiangyu/Malcolm Chen
<refuhoo@google.com>
Fri, 18 May 2018 22:24:46 +0000
(15:24 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 18 May 2018 22:24:46 +0000
(15:24 -0700)
am:
dc7e45e1f3
-s ours
Change-Id: Ifdfe9bf545aff5b97ab0d696c0fc954b3d3af9c5
Trivial merge