Merge "frameworks/opt/net/voip: use proper nativehelper headers" am: eca3c26d49 am: 07e4fc6758 am: 47f9580aaa
am: 7e2aff9fdb

Change-Id: I65d7e44ddac0e4cfe79f82389b40b19370ccfaac
tree: ac1b932ea6f87b41b2e13a84c8417cfd6eda6e16
  1. Android.mk
  2. CleanSpec.mk
  3. src/