tree 4564ad9338d3e3cea00bd270014cb62604dcff8e
parent a0ee0f9d0451d8ba623bd7f919a4b454cf8c4ab4
parent 8dc0fc7e4194ae0cf1b92c8e81973589da893722
author Colin Cross <ccross@android.com> 1493078160 +0000
committer android-build-merger <android-build-merger@google.com> 1493078160 +0000

Merge "Convert external/libgsm to Android.bp" am: c06febc81b am: f433a3841b am: 4ccb7e359b
am: 8dc0fc7e41

Change-Id: I957b11d7411fd9ada84c7526e6e0ec13fe4d92de