tree ac1b932ea6f87b41b2e13a84c8417cfd6eda6e16
parent 78a7feeb2601037bba61aec5f24302896dace6bc
parent 3f08c356fcee333c0f1af25bdf733831bd4be1d9
author Steven Moreland <smoreland@google.com> 1501532227 +0000
committer android-build-merger <android-build-merger@google.com> 1501532227 +0000

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

Change-Id: I170a5285be691a7dcc01399f5477887c0134bea6