OSDN Git Service

am 802ece61: Merge "system_server: add two child chains to firewall" into mnc-dev
authorXiaohui Chen <xiaohuic@google.com>
Thu, 18 Jun 2015 00:07:00 +0000 (00:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 18 Jun 2015 00:07:00 +0000 (00:07 +0000)
* commit '802ece61399e94bbe98cafaa277c71bee73c03ba':
  system_server: add two child chains to firewall


Trivial merge