tree 20f5cb8bbaaa7632670882880fdbe210914b74c8
parent 5b53ffa214b3b41447b690db17901483eb9f7793
parent 4329c0d9d0f911a3407fe73539ad4f2d4c335f07
author Christopher <hocutt@google.com> 1443823298 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443823298 +0000

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

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