OSDN Git Service

(root) / android-x86 / system-netd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5092efb 7ad3c88)
Merge changes Ifbd15bf9,I985e6861,I54860c7c into nyc-dev
authorLorenzo Colitti <lorenzo@google.com>
Mon, 16 May 2016 14:09:21 +0000 (14:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 May 2016 14:09:21 +0000 (14:09 +0000)
am: 7ad3c888e2

* commit '7ad3c888e2781321cf44cb101cdf180a9671ca1e':
  Make FirewallController::createChain use replaceUidChain.
  Make firewallReplaceUidChain match the behaviour of createChain.
  Don't crash the test if expecting more commands than were run.

Change-Id: Ib9dac62413187fc9b4978dfe14b7d29dbf328328


Trivial merge
system/netd
About OSDN
Find Software
Develop Software
Help