tree ac1b932ea6f87b41b2e13a84c8417cfd6eda6e16
parent 78a7feeb2601037bba61aec5f24302896dace6bc
parent 7e2aff9fdb02d4b90203bb0456defd93a0b39e8c
author Steven Moreland <smoreland@google.com> 1501529229 +0000
committer android-build-merger <android-build-merger@google.com> 1501529229 +0000

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

Change-Id: I65d7e44ddac0e4cfe79f82389b40b19370ccfaac