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:
b8e21a7
765a976
)
Merge changes from topic "fix-legacy-android-test-spam" am: 22bd015cba am: fdc58270ef
author
Paul Duffin
<paulduffin@google.com>
Sat, 13 Jan 2018 13:10:35 +0000
(13:10 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Sat, 13 Jan 2018 13:10:35 +0000
(13:10 +0000)
am:
765a976936
-s ours
Change-Id: I5fe3e5d0e1b955a279646c6d1701f79c1700a773
Trivial merge