OSDN Git Service

Merge "Fix errorprone build" am: 3abddeca75 -s ours
authorColin Cross <ccross@android.com>
Wed, 30 Aug 2017 00:46:45 +0000 (00:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 Aug 2017 00:46:45 +0000 (00:46 +0000)
am: 069915cd1c  -s ours

Change-Id: Ifb99a846c309f83f5d31cc81a88ca339787cf68b


Trivial merge