tree 69d4aca794549aab4240f069ea4812224146b231
parent d07bdb6fd165b31aa9e047095e18be7e76e74502
parent ce534905a63f97766f487798fd61cb8414da04fe
author kmccormick <kmccormick@google.com> 1366661404 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366661404 -0700

am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs

* commit 'ce534905a63f97766f487798fd61cb8414da04fe':
  Doc update: Fix firewall text.