tree b7594af17ee433aa5921c92b68a1221041a33a8b
parent f30396c14e62e8de42e82f4893ad1915016749f7
parent c55529bf5e51c31f11d147c77010ab76b358883a
author Andreas Gampe <agampe@google.com> 1518483705 +0000
committer android-build-merger <android-build-merger@google.com> 1518483705 +0000

Merge "Stubs: Disable Errorprone warnings" am: 94d4d65137
am: c55529bf5e

Change-Id: Ia689b382873f015af1b7b2d10630daee165aa264