[automerger skipped] Merge "Remove spurious function declaration"

am: 090e05bd02  -s ours

Change-Id: I919eeb0ec529c444ea0a32835a4b0306c07fab45
gugelfrei
Daniel Rosenberg 6 years ago committed by android-build-merger
commit aeac5d5f57

Diff Content Not Available