tree 28dd9da21ee6c6e2091f3cb884d292f8e5c61c63
parent bc6c1ff8df74cd4cf6eed1c59ea1337545b6ed5d
parent 090e05bd027428420979487a4c0dddbebfe8ec3c
author Daniel Rosenberg <drosen@google.com> 1539735152 -0700
committer android-build-merger <android-build-merger@google.com> 1539735152 -0700

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

Change-Id: I919eeb0ec529c444ea0a32835a4b0306c07fab45