OSDN Git Service

Merge "Fix errorprone build" am: 0bed3cacd7 -s ours am: a1bcb02184 -s ours am:...
authorColin Cross <ccross@android.com>
Thu, 31 Aug 2017 22:43:03 +0000 (22:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 Aug 2017 22:43:03 +0000 (22:43 +0000)
am: bfab966085  -s ours

Change-Id: I53491f4186ffcdd48c6dc0184018fc982a75d549


Trivial merge