tree 99434d950c55c179c27a9c4d80e6041dc16ef62d
parent 1d4cd97354d6f40e57259034c3333d14d448661a
parent ea1891bc2bad2261894647b89ecc3ee08e87d8ff
author Daniel Rosenberg <drosen@google.com> 1539736756 -0700
committer android-build-merger <android-build-merger@google.com> 1539736756 -0700

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

Change-Id: Id9a5de792ec5a4cd9958eab922c423d0bb1b8cff