tree a8d309c3d139c995b49ba695526c202f4aa00bff
parent 52233d339c9c66dab45f5618a9bb6ec93f34c938
author Omari Stephens <xsdg@android.com> 1410999636 -0700
committer Omari Stephens <xsdg@android.com> 1411094453 -0700

DO NOT MERGE  Revert "Switch to guava15 in tf"

Guava15 doesn't exist yet in lmp-dev

This reverts commit 5ca32dea599eb15b16381a47c5b669dfaf655f18.

Bug: 13506843
Change-Id: I4d9f010cb41384352a4f823d7c413f39af06c24d