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)
commit88fa77b640daa9b40f30568d9ebb8fcccb4e5fc1
tree836f3e1c7dd87714a22df2192a00736cc492bc63
parent8c49bbb74a31361c53f1d6cc478b1a7793945265
parent069915cd1c81d4d32e04afb6914c23dc227da359
Merge "Fix errorprone build" am: 3abddeca75  -s ours
am: 069915cd1c  -s ours

Change-Id: Ifb99a846c309f83f5d31cc81a88ca339787cf68b