commit | 32b6ecec4f942b6d22b01bde78f70e8ea2a60ce9 | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Tue Feb 04 22:01:00 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 04 22:01:00 2014 +0000 |
tree | 96a10cce67ed54d5ea4289b36433803e735af077 | |
parent | b59ccea88f1ba4e1a18d378fb9e2a35fc89e055e [diff] | |
parent | 56464091c63a43ab547f107720a9d41e3fc5d6ea [diff] |
am 56464091: am 87dd6440: Merge "Revert "Move tlcd_sock policy over to manta."" * commit '56464091c63a43ab547f107720a9d41e3fc5d6ea': Revert "Move tlcd_sock policy over to manta."