tree 1d65c2606f993e03db3d9b09513d9b5324a76c37
parent 82b844307b0270d5597f4f992258ea8d2c667091
parent 3c8cf2264c9dff01e2f67d0f119c377e8068f880
author Christopher <hocutt@google.com> 1443822897 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443822897 +0000

am 3c8cf226: am 0747145e: am 4bf70778: am 1eb613e1: am 3ece5ae7: Add whitelists for known address, port, and UID combinations Bug: 19461976

* commit '3c8cf2264c9dff01e2f67d0f119c377e8068f880':
  Add whitelists for known address, port, and UID combinations Bug: 19461976