tree d71788d218138c00c90c8c24d75ca38460e43695
parent b56b616c1a75c392e3e07aee07e9cfdb919d5653
parent ea4423b181ab793b7ec9eebe5bc388abbc7be35a
author George Burgess IV <gbiv@google.com> 1476991619 +0000
committer android-build-merger <android-build-merger@google.com> 1476991619 +0000

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

Change-Id: I47de526a03bed05c4f69a89ec3ed2403a7e3b536