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:
420ad97
c620e64
)
Merge "ConnectivityServiceTest: fix flaky tests" am: b8bbd30203 am: 8fea8e5bbd
author
Lorenzo Colitti
<lorenzo@google.com>
Fri, 27 Jan 2017 10:00:06 +0000
(10:00 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 27 Jan 2017 10:00:06 +0000
(10:00 +0000)
am:
c620e64f61
Change-Id: Iaa1ab50a323133cadfa4f39440fce982cde8d1fe
Trivial merge