OSDN Git Service

Merge "Revert^2 "Fix signature of recently changed methods"" am: 3a603777ba am: f65e9...
authorDavid Brazdil <dbrazdil@google.com>
Wed, 9 May 2018 15:12:14 +0000 (08:12 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 May 2018 15:12:14 +0000 (08:12 -0700)
am: 2e8298eecf

Change-Id: I114bb6ce2f1425100b6ce84e383b8efc08b07340


Trivial merge