tree 6431b9aec412053e6ed4d0b6e2b83f74e23fec6b
parent 5a852a1a94649f81d53682c3fd247c1a55d7aaf5
author Colin Cross <ccross@android.com> 1395446397 -0700
committer Colin Cross <ccross@android.com> 1401901801 -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.

(cherry picked from commit 65480a071f2f0db010d47535513a98e47477d8d2)

Change-Id: Ide26ec95bb606165094890faa7d3aee7490be7f6