[automerger skipped] Merge "Remove spurious function declaration" am: 090e05bd02 -s ours am: aeac5d5f57 -s ours

am: ea1891bc2b  -s ours

Change-Id: Id9a5de792ec5a4cd9958eab922c423d0bb1b8cff
This commit is contained in:
Daniel Rosenberg 2018-10-16 17:39:16 -07:00 committed by android-build-merger
commit 5731a7a4e3

Diff content is not available