tree 9c94f05a1d70c3e6aa629dabe5514d2c5da16b16
parent fd1e90b3b1455615ff00c21dc90a0d4bfa21840e
author Colin Cross <ccross@android.com> 1395446397 -0700
committer Colin Cross <ccross@android.com> 1395447594 -0700

DO NOT MERGE: Revert "remove external/libnl-headers from the manifest"

This reverts commit fd1e90b3b1455615ff00c21dc90a0d4bfa21840e.

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

Change-Id: I85365fb4b8931a998e564d30800a06343a47fdd8