Merge "Fix headers relating to the VNDK."
tree: 39cf325fb36532ff61b0f2643c480166365c8d2f
  1. common/
  2. guest/
  3. host/
  4. tools/
  5. Android.bp
  6. Android.mk