commit | ca7b07072849fa2e4bf4e074ce1366eb7138befc | [log] [tgz] |
---|---|---|
author | Sreeram Ramachandran <sreeram@google.com> | Tue Nov 25 15:10:08 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:10:08 2014 +0000 |
tree | 732199fe88ddf96f925b2d030710f8a86ce66927 | |
parent | e86bc05ac6c7db024858ea7838ded83b6bfdd32b [diff] | |
parent | 1d16570b374ffaea89a3e3d403146008d12e60b9 [diff] |
am 1d16570b: am aaea7e81: Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev * commit '1d16570b374ffaea89a3e3d403146008d12e60b9': Eliminate race conditions in UID-based network filtering.