tree bd23ce9ac8e78a5664eae01405074340a23ffb20
parent 3efef9adedf2fabf7f53fd643a8053f9ee0dcfea
parent f65e9d8d36e62f6969f4b79e08c5a1ad47e05119
author David Brazdil <dbrazdil@google.com> 1525878087 -0700
committer android-build-merger <android-build-merger@google.com> 1525878087 -0700

Merge "Revert^2 "Fix signature of recently changed methods"" am: 3a603777ba
am: f65e9d8d36

Change-Id: Ia1dd7b136236ebdcd854e4d5fe0b51276e48536a