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:
a856247
e34370e
)
Merge "Add legacy-test as replacement for core-junit" am: e75a82a92f am: a485fa1fce...
author
Paul Duffin
<paulduffin@google.com>
Wed, 30 Nov 2016 13:35:15 +0000
(13:35 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 30 Nov 2016 13:35:15 +0000
(13:35 +0000)
am:
e34370edfd
-s ours
Change-Id: I0a06fd6b8c7c9c860ecf293728c1c0d887b82358
Trivial merge