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:
803abe7
bea6020
)
DO NOT MERGE Extending DNS event reporting am: 70444d3ad5
author
Michal Karpinski
<mkarpinski@google.com>
Tue, 6 Dec 2016 11:51:24 +0000
(11:51 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 6 Dec 2016 11:51:24 +0000
(11:51 +0000)
am:
bea60201f3
-s ours
Change-Id: Icd67ff044613a33d938f6c21b8a19e95c06c05aa
Trivial merge