[automerger skipped] Merge "Fix signature of recently changed methods" am: 4b2f7576a0 -s ours

am: efa9288a1d  -s ours

Change-Id: Iaf0b3f3f2f1e66c6093a81c920456e5fb7bc6560
This commit is contained in:
David Brazdil
2018-05-09 04:49:54 -07:00
committed by android-build-merger

Diff Content Not Available