tree 737b1cccc66a9f156612aa6f83120e35e6b12ae6
parent 5e86d5717e17f81e8adf909a42dea5034784e859
parent e853bd540f57319380433dbf355c7ad91487da7f
author David Gross <dgross@google.com> 1479927529 +0000
committer android-build-merger <android-build-merger@google.com> 1479927529 +0000

Fix code to avoid various compiler warnings. am: a4eb334c79 am: b7af82162d
am: e853bd540f

Change-Id: I71527955f5680c1503e4eb8390e6079297b7a817