[automerger skipped] Merge "Revert "Fix signature of recently changed methods"" am: 89a4b96b9c -s ours am: dbf2ef0607 -s ours

am: 3efef9aded  -s ours

Change-Id: I47bd34ebb61b4233c9a260adc223f0af0abcbb05
This commit is contained in:
David Brazdil
2018-05-09 07:00:11 -07:00
committed by android-build-merger

Diff Content Not Available