tree af20a3ad7e2953a7c05f622038296f0d5ddc2ad1
parent 3f08c356fcee333c0f1af25bdf733831bd4be1d9
parent 7901c16586d92913a83e6218869bdd84ee74e880
author Nan Zhang <nanzhang@google.com> 1519430106 +0000
committer android-build-merger <android-build-merger@google.com> 1519430106 +0000

Merge "Convert voip-common to Soong in order to support droiddoc." am: 7c60568142
am: 7901c16586

Change-Id: I21a326c189647475c8dca3cea8e8af08936d83fc