tree 28dd9da21ee6c6e2091f3cb884d292f8e5c61c63
parent 99ae565fbfe2122cfd5a692f192fe6d064d5fdce
parent aeac5d5f577a1661f136062cc62b70cdcc88d2b2
author Daniel Rosenberg <drosen@google.com> 1539735957 -0700
committer android-build-merger <android-build-merger@google.com> 1539735957 -0700

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

Change-Id: Ic5c0ceb3398da3c3a92e370b3d7edb70884f902c