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

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

Change-Id: I1d2eb7b3a21ef8b7f5772e8655de841c558c4ee3