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

am: dbf2ef0607  -s ours

Change-Id: I5a3e819f398c10c7a3faf6a0040db406a66c15c2
This commit is contained in:
David Brazdil
2018-05-09 06:52:04 -07:00
committed by android-build-merger

Diff Content Not Available