tree 8bc15c21bf8b4e1496930e77a1820cdf16ae4584
parent 7af2ee2089f50de9e83f2fe9a5c981f7a6c43eda
parent 9d4922f5239006078c86258351bb8d102850be97
author Colin Cross <ccross@android.com> 1480714985 +0000
committer android-build-merger <android-build-merger@google.com> 1480714985 +0000

Merge "Convert webp to Android.bp"
am: 9d4922f523

Change-Id: If9fa342365ac0a8942ae2de96f4cf89a6d0b8ade