OSDN Git Service

am 47cccbd0: am f9a152d8: am 0415ea6a: am 2aca8dbe: am b116885c: am ce534905: Merge...
authorkmccormick <kmccormick@google.com>
Tue, 23 Apr 2013 10:50:44 +0000 (03:50 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 23 Apr 2013 10:50:44 +0000 (03:50 -0700)
commit7fccb94248514fc1037985330e6f4f0b0cc5ce3f
tree966dfcdc0cf4d4aba505ba063e66802bedc5e73c
parent5ced567d768ae68796e017a2e1e5e72f7f22fef3
parent47cccbd09d4fe2f408bf88c39faa7530d202c233
am 47cccbd0: am f9a152d8: am 0415ea6a: am 2aca8dbe: am b116885c: am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs

* commit '47cccbd09d4fe2f408bf88c39faa7530d202c233':
  Doc update: Fix firewall text.