[automerger skipped] Merge "Revert "Fix signature of recently changed methods""

am: 89a4b96b9c  -s ours

Change-Id: I4f5c4d87f419cafc44b6f93a24a29720db744d06
This commit is contained in:
David Brazdil
2018-05-09 06:40:55 -07:00
committed by android-build-merger

Diff Content Not Available