tree 83c5fd1c67e992c1d6ca53094a8dab59921e3e97
parent 7ab32aca56fe8df4575fc2e2e40ff7e1d38fca60
author Colin Cross <ccross@android.com> 1395446360 -0700
committer Qiwen Zhao <zhao@google.com> 1401894948 -0700

DO NOT MERGE: Revert "delete libnl_2"

This reverts commit 7097f052d946bc9fbe298c7a88e1d943f54f684e.

libnl_2 needs to stay in AOSP for now for compatibility with
GPL test builds.