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:
88672d7
c398c0f
)
Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4." am: ff93f92...
author
Felipe Leme
<felipeal@google.com>
Tue, 13 Dec 2016 00:41:15 +0000
(
00:41
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 13 Dec 2016 00:41:15 +0000
(
00:41
+0000)
am:
c398c0fc8d
-s ours
Change-Id: I44dd708ba7b890cc54f27cdcee7334c25a215411
Trivial merge