tree 737b1cccc66a9f156612aa6f83120e35e6b12ae6
parent 4eaa31de35d27665d0379ccf5121affa7ec07528
parent 31ce82c3db81fa5cbf9f41388b660b971329e3b9
author David Gross <dgross@google.com> 1479927679 +0000
committer android-build-merger <android-build-merger@google.com> 1479927679 +0000

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

Change-Id: I421ab26df5762cdb01232ea934c3a07dfe79bc13