tree f6be23ebb39018cb6480eb5510b889f192b4b641
parent abfd527d0924b56bc2e4e8b4281300bfabd791f7
parent 63b4f6f5db4d5ea0114d195a0f33970e7070f21b
author George Burgess IV <gbiv@google.com> 1476991155 +0000
committer android-build-merger <android-build-merger@google.com> 1476991155 +0000

Merge "Fix a static-analyzer warning."
am: 63b4f6f5db

Change-Id: I85fd6d25733d59da76eb0bab381fdbd3b5a0430d