tree ce6cc0d676f0d541b16957d975bc489c94edecba
parent 22f13fd48fb232a9a29b43dc2e11dfaeef121ca3
parent 725ce5fa4206ac43a772bddff1ba6ab5bbd93c23
author Chris Banes <chrisbanes@google.com> 1484743233 +0000
committer android-build-merger <android-build-merger@google.com> 1484743233 +0000

Merge "Fix some issues caught via a static analyzer" into nyc-support-25.2-dev
am: 725ce5fa42

Change-Id: I962843580a9d3b46d8aa37f9f4facb74c7ca8d2d