tree 92757f3ecdf4e453cb89a105f1970423413de05e
parent be15b9643b868e4926dc2ff0bcd354ea168b3001
parent a40eeb09795755c05ccbc53fe480722f2ea7cd38
author George Burgess IV <gbiv@google.com> 1476475671 +0000
committer android-build-merger <android-build-merger@google.com> 1476475671 +0000

Merge "Fix static-analyzer warning." am: 2fbf30d3fe am: a52992e290 am: c88628da5e
am: a40eeb0979

Change-Id: I973bb3f7f72f38133472874727b4297042ee0a50