OSDN Git Service

Merge "Monitor the firewall rules file for changes" into jb-mr2-dev
authorBen Gruver <bgruv@google.com>
Wed, 17 Apr 2013 00:44:56 +0000 (00:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 17 Apr 2013 00:44:56 +0000 (00:44 +0000)
commit53f22ad9c30e03f4762737a722b2762dcf934523
tree0193840321def42cf0a6aae5884db814392e8aa5
parent95a869f91bb9ab24300cec37037b0edcfa54f334
parenta4879c3425ae6ce46d7e7273c081a973a1c79ac6
Merge "Monitor the firewall rules file for changes" into jb-mr2-dev
services/java/com/android/server/am/ActivityManagerService.java