tree 8d5b3f7abf41bb17fe8eeb16c9d754752fc730a2
parent e3fb0afa964f8975d5c91ccbbdaeceee7fb0548d
parent cf1a558aed1b5dd28ce5daab4713568ceb6ddbd6
author George Burgess IV <gbiv@google.com> 1479870346 +0000
committer android-build-merger <android-build-merger@google.com> 1479870346 +0000

Merge "Fix static analyzer warnings." am: 9c69c41b95 am: 4cfb0f020f am: 6ab25ba5f1
am: cf1a558aed

Change-Id: I4e2608df649dfd3384aadd1f69d88ffc69bf7ea9