tree 81bc850a8ba78249752047eb586637b80f4d483e
parent e352b3d5dedc0a281f4c0cbcd5ac1e8ae6193b90
parent 6a96182e0081afe6d009734cd189f3d75c40cfa6
author Colin Cross <ccross@android.com> 1508800347 +0000
committer android-build-merger <android-build-merger@google.com> 1508800347 +0000

Merge "Convert external/guava to Android.bp" am: 7e8dbb922b am: d137d8b461
am: 6a96182e00

Change-Id: I0b7d7ff96907c43d3173ad381e8e9b028e05477a