tree 1527f350cc87f6b015d891ade00851027ef9e520
parent 01fa0d7aae1a551e1e7cfb90d2aeaf2fcb3978af
parent 8568db534118fc14cc28100306d51626464ff319
author Jesse Wilson <jessewilson@google.com> 1309330022 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1309330022 -0700

Merge "Move socket tagging from libcore."