tree aebf591f3a5fbc6ac72212ab5c5735d719329f5b
parent 64e15096e5fa99656d70d3aa09fde7f0c49165a2
parent 6432cf64b65e4cb9874b14025b73ebc889d775a4
author Dan Willemsen <dwillemsen@google.com> 1517298637 +0000
committer android-build-merger <android-build-merger@google.com> 1517298637 +0000

Merge "Clean up some kati warnings" am: 157fbf771b
am: 6432cf64b6

Change-Id: I49dac5cbfb0dac0c6302775f1e3defeaff8c2dcb