Merge "Fix GCC 6.3 warnings in aosp/master" am: 1211e9fe1b am: 56ed30da81 am: 2bd761c309
authorPyry Haulos <phaulos@google.com>
Tue, 9 May 2017 19:28:26 +0000 (19:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 May 2017 19:28:26 +0000 (19:28 +0000)
am: 10d242c3d6

Change-Id: I36d13ffd548cfa752c1fceb8d95bc6092762eb43


Trivial merge