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:
c6cd39a
0a6f66e
)
Merge "Testables lib should not statically link mockito" am: 47d04fc5c0 am: b42cd23425
author
Philip P. Moltmann
<moltmann@google.com>
Thu, 21 Dec 2017 19:59:29 +0000
(19:59 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 21 Dec 2017 19:59:29 +0000
(19:59 +0000)
am:
0a6f66e9a9
-s ours
Change-Id: I86a59fd6006a3ba59b237044c61ab1d5c2a61333
Trivial merge