tree b7dfff18212aa9613c1dfbfcb100ac863148e008
parent 77a5123b2aa9cb27919b17e4da26bc7281e14943
parent 41194d937cbb863618d9e82f6650564979b596d0
author Caroline Tice <cmtice@google.com> 1486596984 +0000
committer android-build-merger <android-build-merger@google.com> 1486596984 +0000

Merge "Fix static analyzer warnings" am: 9064b2d12a am: 9924503dfe
am: 41194d937c

Change-Id: I86f7ca87a54797027949c6d30afe8862f019f34e