OSDN Git Service

Merge "DO NOT MERGE Fix build failure due to missing guava target" into nyc-mr2-dev...
authorSteven Ng <stevenckng@google.com>
Wed, 17 May 2017 22:49:14 +0000 (22:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 May 2017 22:49:14 +0000 (22:49 +0000)
am: 3b76c25cee  -s ours

Change-Id: I6b9f260b8494ced24cd758207981d60c9a5ca97e


Trivial merge