OSDN Git Service

Merge changes Ifbd15bf9,I985e6861,I54860c7c into nyc-dev
authorLorenzo Colitti <lorenzo@google.com>
Mon, 16 May 2016 14:02:00 +0000 (14:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 16 May 2016 14:02:00 +0000 (14:02 +0000)
commit7ad3c888e2781321cf44cb101cdf180a9671ca1e
tree78b1e37e9a31d2dc2956e4847dc38ad250e7e256
parent4f88299120b076dc068a67cf0f0343660a2777fa
parenta55388e3f3dd726e470e195770649a2797d7e02f
Merge changes Ifbd15bf9,I985e6861,I54860c7c into nyc-dev

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